Fix for bug #6937: changed ConstructFrameByDisplayType() to use the correct

parent frame pointer for floated elements

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,

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,