Backout bug 413016 in case it is causing qm-mini-ubuntu05 failure
authorlongsonr@gmail.com
Tue, 22 Jan 2008 08:37:34 -0800
changeset 10534 644a5c44deeacf9533bda8757bf817049e293f0b
parent 10533 61b9083aecb161fd2910eff3fa32dc5d8c2aac1d
child 10535 e515f074b29ca8f0d5caff19907b34d9fe72f386
push id1
push userbsmedberg@mozilla.com
push dateThu, 20 Mar 2008 16:49:24 +0000
treeherdermozilla-central@61007906a1f8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs413016
milestone1.9b3pre
Backout bug 413016 in case it is causing qm-mini-ubuntu05 failure
layout/base/nsCSSFrameConstructor.cpp
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -4353,17 +4353,16 @@ nsCSSFrameConstructor::ConstructDocEleme
 
   NS_ASSERTION(!display->IsScrollableOverflow() || 
                aState.mPresContext->IsPaginated() ||
                propagatedScrollToViewport,
                "Scrollbars should have been propagated to the viewport");
 #endif
 
   nsIFrame* contentFrame = nsnull;
-  PRBool canHaveGeneratedContent = PR_TRUE;
   PRBool isBlockFrame = PR_FALSE;
   nsresult rv;
 
   // The rules from CSS 2.1, section 9.2.4, have already been applied
   // by the style system, so we can assume that display->mDisplay is
   // either NONE, BLOCK, or TABLE.
 
   PRBool docElemIsTable = (display->mDisplay == NS_STYLE_DISPLAY_TABLE) &&
@@ -4386,17 +4385,16 @@ nsCSSFrameConstructor::ConstructDocEleme
       contentFrame = NS_NewDocElementBoxFrame(mPresShell, styleContext);
     }
     else
 #endif 
 #ifdef MOZ_SVG
     if (aDocElement->GetNameSpaceID() == kNameSpaceID_SVG) {
       if (aDocElement->Tag() == nsGkAtoms::svg && NS_SVGEnabled()) {
         contentFrame = NS_NewSVGOuterSVGFrame(mPresShell, aDocElement, styleContext);
-        canHaveGeneratedContent = PR_FALSE;
       } else {
         return NS_ERROR_FAILURE;
       }
     }
     else 
 #endif
     {
       contentFrame = NS_NewDocumentElementFrame(mPresShell, styleContext);
@@ -4437,18 +4435,18 @@ nsCSSFrameConstructor::ConstructDocEleme
                                       haveFirstLineStyle);
     }
 
     // Create any anonymous frames the doc element frame requires
     // This must happen before ProcessChildren to ensure that popups are
     // never constructed before the popupset.
     CreateAnonymousFrames(nsnull, aState, aDocElement, contentFrame,
                           PR_FALSE, childItems, PR_TRUE);
-    ProcessChildren(aState, aDocElement, contentFrame, canHaveGeneratedContent,
-                    childItems, isBlockFrame);
+    ProcessChildren(aState, aDocElement, contentFrame, PR_TRUE, childItems,
+                    isBlockFrame);
 
     // Set the initial child lists
     contentFrame->SetInitialChildList(nsnull, childItems.childList);
   }
 
   return NS_OK;
 }