corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 438987, backing out

Browse Source
This commit is contained in:
Robert O'Callahan
2008-08-08 15:34:43 +12:00
parent 3de083aee1
commit 11f74adf1a
4 changed files with 85 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
layout/base/nsCSSFrameConstructor.cpp
View File

@@ -1794,7 +1794,6 @@ nsCSSFrameConstructor::nsCSSFrameConstructor(nsIDocument *aDocument,
: mDocument(aDocument)
, mPresShell(aPresShell)
, mInitialContainingBlock(nsnull)
, mRootElementStyleFrame(nsnull)
, mFixedContainingBlock(nsnull)
, mDocElementContainingBlock(nsnull)
, mGfxScrollFrame(nsnull)
@@ -4381,16 +4380,6 @@ nsCSSFrameConstructor::ConstructDocElementFrame(nsFrameConstructorState& aState,
mInitialContainingBlock = contentFrame;
mInitialContainingBlockIsAbsPosContainer = PR_FALSE;
// Figure out which frame has the main style for the document element,
// assigning it to mRootElementStyleFrame.
// Backgrounds should be propagated from that frame to the viewport.
PRBool isChild;
contentFrame->GetParentStyleContextFrame(aState.mPresContext,
&mRootElementStyleFrame, &isChild);
if (!isChild) {
mRootElementStyleFrame = mInitialContainingBlock;
}
// if it was a table then we don't need to process our children.
if (!docElemIsTable) {
// Process the child content
@@ -9471,7 +9460,7 @@ nsCSSFrameConstructor::ContentRemoved(nsIContent* aContainer,
if (mInitialContainingBlock == childFrame) {
mInitialContainingBlock = nsnull;
mRootElementStyleFrame = nsnull;
mInitialContainingBlockIsAbsPosContainer = PR_FALSE;
}
if (haveFLS && mInitialContainingBlock) {