From be892611780a71ff5a47b77e44bb608dbb211d0d Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Wed, 23 Jun 1999 03:14:24 +0000 Subject: [PATCH] Fix for bug #6937: changed ConstructFrameByDisplayType() to use the correct parent frame pointer for floated elements git-svn-id: svn://10.0.0.236/trunk@36439 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsCSSFrameConstructor.cpp | 3 ++- mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp index 18701f5cb26..18c54827f58 100644 --- a/mozilla/layout/base/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp @@ -3323,7 +3323,8 @@ nsCSSFrameConstructor::ConstructFrameByDisplayType(nsIPresContext* aPre NS_NewFloatingItemWrapperFrame(&newFrame); // Initialize the frame - newFrame->Init(*aPresContext, aContent, aParentFrame, aStyleContext, nsnull); + newFrame->Init(*aPresContext, aContent, aState.mFloatedItems.containingBlock, + aStyleContext, nsnull); // See if we need to create a view nsHTMLContainerFrame::CreateViewForFrame(*aPresContext, newFrame, diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp index 18701f5cb26..18c54827f58 100644 --- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp +++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp @@ -3323,7 +3323,8 @@ nsCSSFrameConstructor::ConstructFrameByDisplayType(nsIPresContext* aPre NS_NewFloatingItemWrapperFrame(&newFrame); // Initialize the frame - newFrame->Init(*aPresContext, aContent, aParentFrame, aStyleContext, nsnull); + newFrame->Init(*aPresContext, aContent, aState.mFloatedItems.containingBlock, + aStyleContext, nsnull); // See if we need to create a view nsHTMLContainerFrame::CreateViewForFrame(*aPresContext, newFrame,