Bug 1349457 - stylo: Eagerly style generated content. r=bholley
authorCameron McCormack <cam@mcc.id.au>
Thu, 23 Mar 2017 11:44:00 +0800
changeset 348991 0c15ca7e1ba72121fddcca37e24ba5270d38a399
parent 348990 1038d1c502befc9217de56f92665bdd536cdd30e
child 348992 941503eb23a68bc2b0e1a02e9c0ab612d025b072
push id39371
push usercmccormack@mozilla.com
push dateThu, 23 Mar 2017 03:48:21 +0000
treeherderautoland@0c15ca7e1ba7 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbholley
bugs1349457
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1349457 - stylo: Eagerly style generated content. r=bholley MozReview-Commit-ID: Jv3hNEjUonp
layout/base/nsCSSFrameConstructor.cpp
layout/generic/crashtests/crashtests.list
--- a/layout/base/nsCSSFrameConstructor.cpp
+++ b/layout/base/nsCSSFrameConstructor.cpp
@@ -1908,16 +1908,20 @@ nsCSSFrameConstructor::CreateGeneratedCo
     nsCOMPtr<nsIContent> content =
       CreateGeneratedContent(aState, aParentContent, pseudoStyleContext,
                              contentIndex);
     if (content) {
       container->AppendChildTo(content, false);
     }
   }
 
+  if (aParentContent->IsStyledByServo()) {
+    mPresShell->StyleSet()->AsServo()->StyleNewSubtree(container);
+  }
+
   AddFrameConstructionItemsInternal(aState, container, aParentFrame, elemName,
                                     kNameSpaceID_None, true,
                                     pseudoStyleContext,
                                     ITEM_IS_GENERATED_CONTENT, nullptr,
                                     aItems);
 }
 
 /****************************************************
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -77,17 +77,17 @@ load 368568.html
 load 368752.html
 load 368860-1.html
 load 368863-1.html
 load 369038-1.xhtml
 load 369150-1.html
 load 369150-2.html
 load 369227-1.xhtml
 load 369542-1.html
-load 369542-2.html
+asserts-if(stylo,2) load 369542-2.html # bug 1324646
 load 369547-1.html
 load 370174-1.html
 load 370174-2.html
 load 370174-3.html
 load 370174-4.html
 load 370699-1.html
 load 370794-1.html
 load 370866-1.xhtml
@@ -410,17 +410,17 @@ asserts-if(stylo,4) load 553504-1.xhtml 
 load 564368-1.xhtml
 load 564968.xhtml
 load 569193-1.html
 load 570160.html
 load 570289-1.html
 load 571618-1.svg
 asserts(1) asserts-if(stylo,0-1) load 571975-1.html # bug 574889
 load 571995.xhtml
-load 574958.xhtml # bug 1323696
+asserts-if(stylo,2) load 574958.xhtml # bug 1324646
 asserts(0-4) load 578977.html # bug 757305
 load 580504-1.xhtml
 load 585598-1.xhtml
 load 586806-1.html
 load 586806-2.html
 load 586806-3.html
 load 586973-1.html
 load 589002-1.html