From a7dc1c48ab5c2c0deea8b2dae189201de2e87fa7 Mon Sep 17 00:00:00 2001 From: troy Date: Sat, 18 Apr 1998 22:06:05 +0000 Subject: [PATCH] Fixed a problem where mLastContentIsComplete wasn't getting set right for block-level elements git-svn-id: svn://10.0.0.236/trunk@373 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsBlockFrame.cpp | 4 ++++ mozilla/layout/generic/nsBlockReflowState.cpp | 4 ++++ mozilla/layout/generic/nsBlockReflowState.h | 4 ++++ mozilla/layout/html/base/src/nsBlockFrame.cpp | 4 ++++ mozilla/layout/html/base/src/nsBlockReflowState.cpp | 4 ++++ mozilla/layout/html/base/src/nsBlockReflowState.h | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index f7b68cba953..e6aecebc517 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -1057,6 +1057,10 @@ nsBlockFrame::PlaceAndReflowChild(nsIPresContext* aCX, } // Add block child + // XXX We need to set lastContentIsComplete here, because AddBlockChild() + // calls AdvaneceToNextLine(). We need to restructure the flow of control, + // and use a state machine... + aState.lastContentIsComplete = PRBool(status == frComplete); AddBlockChild(aCX, aState, kidFrame, kidRect, pKidMaxElementSize, kidMol); } diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index f7b68cba953..e6aecebc517 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -1057,6 +1057,10 @@ nsBlockFrame::PlaceAndReflowChild(nsIPresContext* aCX, } // Add block child + // XXX We need to set lastContentIsComplete here, because AddBlockChild() + // calls AdvaneceToNextLine(). We need to restructure the flow of control, + // and use a state machine... + aState.lastContentIsComplete = PRBool(status == frComplete); AddBlockChild(aCX, aState, kidFrame, kidRect, pKidMaxElementSize, kidMol); } diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index f7b68cba953..e6aecebc517 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -1057,6 +1057,10 @@ nsBlockFrame::PlaceAndReflowChild(nsIPresContext* aCX, } // Add block child + // XXX We need to set lastContentIsComplete here, because AddBlockChild() + // calls AdvaneceToNextLine(). We need to restructure the flow of control, + // and use a state machine... + aState.lastContentIsComplete = PRBool(status == frComplete); AddBlockChild(aCX, aState, kidFrame, kidRect, pKidMaxElementSize, kidMol); } diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index f7b68cba953..e6aecebc517 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -1057,6 +1057,10 @@ nsBlockFrame::PlaceAndReflowChild(nsIPresContext* aCX, } // Add block child + // XXX We need to set lastContentIsComplete here, because AddBlockChild() + // calls AdvaneceToNextLine(). We need to restructure the flow of control, + // and use a state machine... + aState.lastContentIsComplete = PRBool(status == frComplete); AddBlockChild(aCX, aState, kidFrame, kidRect, pKidMaxElementSize, kidMol); } diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index f7b68cba953..e6aecebc517 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -1057,6 +1057,10 @@ nsBlockFrame::PlaceAndReflowChild(nsIPresContext* aCX, } // Add block child + // XXX We need to set lastContentIsComplete here, because AddBlockChild() + // calls AdvaneceToNextLine(). We need to restructure the flow of control, + // and use a state machine... + aState.lastContentIsComplete = PRBool(status == frComplete); AddBlockChild(aCX, aState, kidFrame, kidRect, pKidMaxElementSize, kidMol); } diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index f7b68cba953..e6aecebc517 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -1057,6 +1057,10 @@ nsBlockFrame::PlaceAndReflowChild(nsIPresContext* aCX, } // Add block child + // XXX We need to set lastContentIsComplete here, because AddBlockChild() + // calls AdvaneceToNextLine(). We need to restructure the flow of control, + // and use a state machine... + aState.lastContentIsComplete = PRBool(status == frComplete); AddBlockChild(aCX, aState, kidFrame, kidRect, pKidMaxElementSize, kidMol); }