From 63a9d6b36f60238c75b245a5228f90c275356a66 Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Wed, 8 Dec 1999 02:05:51 +0000 Subject: [PATCH] Removed code from PrepareChildIncrementalReflow() that was marking all lines dirty if max-element-size was requested. --- layout/generic/nsBlockFrame.cpp | 12 ------------ layout/generic/nsBlockReflowState.cpp | 12 ------------ layout/generic/nsBlockReflowState.h | 12 ------------ layout/html/base/src/nsBlockFrame.cpp | 12 ------------ layout/html/base/src/nsBlockReflowState.cpp | 12 ------------ layout/html/base/src/nsBlockReflowState.h | 12 ------------ 6 files changed, 72 deletions(-) diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index 8d27ba805485..b293a8a08e51 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -1994,18 +1994,6 @@ nsBlockFrame::PrepareInitialReflow(nsBlockReflowState& aState) nsresult nsBlockFrame::PrepareChildIncrementalReflow(nsBlockReflowState& aState) { - // If by chance we are inside a table, then give up and reflow - // everything because we don't cache max-element-size information in - // the lines. - // XXX Huh, that's not true anymore. We do cache the width component of - // the max-element-size... - if (aState.mComputeMaxElementSize) { -#ifdef DEBUG_troy - printf("BLOCK: marking all child frames dirty...\n"); -#endif - return PrepareResizeReflow(aState); - } - // Determine the line being impacted PRBool isFloater; nsLineBox* prevLine; diff --git a/layout/generic/nsBlockReflowState.cpp b/layout/generic/nsBlockReflowState.cpp index 8d27ba805485..b293a8a08e51 100644 --- a/layout/generic/nsBlockReflowState.cpp +++ b/layout/generic/nsBlockReflowState.cpp @@ -1994,18 +1994,6 @@ nsBlockFrame::PrepareInitialReflow(nsBlockReflowState& aState) nsresult nsBlockFrame::PrepareChildIncrementalReflow(nsBlockReflowState& aState) { - // If by chance we are inside a table, then give up and reflow - // everything because we don't cache max-element-size information in - // the lines. - // XXX Huh, that's not true anymore. We do cache the width component of - // the max-element-size... - if (aState.mComputeMaxElementSize) { -#ifdef DEBUG_troy - printf("BLOCK: marking all child frames dirty...\n"); -#endif - return PrepareResizeReflow(aState); - } - // Determine the line being impacted PRBool isFloater; nsLineBox* prevLine; diff --git a/layout/generic/nsBlockReflowState.h b/layout/generic/nsBlockReflowState.h index 8d27ba805485..b293a8a08e51 100644 --- a/layout/generic/nsBlockReflowState.h +++ b/layout/generic/nsBlockReflowState.h @@ -1994,18 +1994,6 @@ nsBlockFrame::PrepareInitialReflow(nsBlockReflowState& aState) nsresult nsBlockFrame::PrepareChildIncrementalReflow(nsBlockReflowState& aState) { - // If by chance we are inside a table, then give up and reflow - // everything because we don't cache max-element-size information in - // the lines. - // XXX Huh, that's not true anymore. We do cache the width component of - // the max-element-size... - if (aState.mComputeMaxElementSize) { -#ifdef DEBUG_troy - printf("BLOCK: marking all child frames dirty...\n"); -#endif - return PrepareResizeReflow(aState); - } - // Determine the line being impacted PRBool isFloater; nsLineBox* prevLine; diff --git a/layout/html/base/src/nsBlockFrame.cpp b/layout/html/base/src/nsBlockFrame.cpp index 8d27ba805485..b293a8a08e51 100644 --- a/layout/html/base/src/nsBlockFrame.cpp +++ b/layout/html/base/src/nsBlockFrame.cpp @@ -1994,18 +1994,6 @@ nsBlockFrame::PrepareInitialReflow(nsBlockReflowState& aState) nsresult nsBlockFrame::PrepareChildIncrementalReflow(nsBlockReflowState& aState) { - // If by chance we are inside a table, then give up and reflow - // everything because we don't cache max-element-size information in - // the lines. - // XXX Huh, that's not true anymore. We do cache the width component of - // the max-element-size... - if (aState.mComputeMaxElementSize) { -#ifdef DEBUG_troy - printf("BLOCK: marking all child frames dirty...\n"); -#endif - return PrepareResizeReflow(aState); - } - // Determine the line being impacted PRBool isFloater; nsLineBox* prevLine; diff --git a/layout/html/base/src/nsBlockReflowState.cpp b/layout/html/base/src/nsBlockReflowState.cpp index 8d27ba805485..b293a8a08e51 100644 --- a/layout/html/base/src/nsBlockReflowState.cpp +++ b/layout/html/base/src/nsBlockReflowState.cpp @@ -1994,18 +1994,6 @@ nsBlockFrame::PrepareInitialReflow(nsBlockReflowState& aState) nsresult nsBlockFrame::PrepareChildIncrementalReflow(nsBlockReflowState& aState) { - // If by chance we are inside a table, then give up and reflow - // everything because we don't cache max-element-size information in - // the lines. - // XXX Huh, that's not true anymore. We do cache the width component of - // the max-element-size... - if (aState.mComputeMaxElementSize) { -#ifdef DEBUG_troy - printf("BLOCK: marking all child frames dirty...\n"); -#endif - return PrepareResizeReflow(aState); - } - // Determine the line being impacted PRBool isFloater; nsLineBox* prevLine; diff --git a/layout/html/base/src/nsBlockReflowState.h b/layout/html/base/src/nsBlockReflowState.h index 8d27ba805485..b293a8a08e51 100644 --- a/layout/html/base/src/nsBlockReflowState.h +++ b/layout/html/base/src/nsBlockReflowState.h @@ -1994,18 +1994,6 @@ nsBlockFrame::PrepareInitialReflow(nsBlockReflowState& aState) nsresult nsBlockFrame::PrepareChildIncrementalReflow(nsBlockReflowState& aState) { - // If by chance we are inside a table, then give up and reflow - // everything because we don't cache max-element-size information in - // the lines. - // XXX Huh, that's not true anymore. We do cache the width component of - // the max-element-size... - if (aState.mComputeMaxElementSize) { -#ifdef DEBUG_troy - printf("BLOCK: marking all child frames dirty...\n"); -#endif - return PrepareResizeReflow(aState); - } - // Determine the line being impacted PRBool isFloater; nsLineBox* prevLine;