Bug 1324647 - stylo: Downgrade "Need to flush before destroying!" assertion since it occurs frequently. r=me
authorCameron McCormack <cam@mcc.id.au>
Tue, 31 Jan 2017 15:10:45 +0800
changeset 331957 dca29e340ecc3a9064d43feda0ff66e0a3ec7424
parent 331956 89782a895ca2b4ecf9eb1a7c514d033a916b9ad8
child 331958 9e32610a0a1c3ffc6fa66054b1240cde2655a795
push id31291
push usercbook@mozilla.com
push dateWed, 01 Feb 2017 12:14:40 +0000
treeherdermozilla-central@9e7b1041929f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1324647
milestone54.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 1324647 - stylo: Downgrade "Need to flush before destroying!" assertion since it occurs frequently. r=me MozReview-Commit-ID: AOUnCyG4I2O
dom/plugins/test/crashtests/crashtests.list
layout/base/OverflowChangedTracker.h
layout/base/crashtests/crashtests.list
layout/generic/crashtests/crashtests.list
layout/svg/crashtests/crashtests.list
--- a/dom/plugins/test/crashtests/crashtests.list
+++ b/dom/plugins/test/crashtests/crashtests.list
@@ -6,9 +6,9 @@ asserts-if(winWidget&&browserIsRemote,0-
 load 570884.html
 # This test relies on the reading of screenX/Y forcing a round trip to
 # the X server, which is a bad assumption for <browser remote>.
 # Plugin arch is going to change anyway with OOP content so skipping
 # this test for now is OK.
 skip-if(!haveTestPlugin||http.platform!="X11") load 598862.html
 skip-if(Android) load 626602-1.html # bug 908363
 load 752340.html
-asserts-if(stylo,1) load 843086.xhtml # bug 1324647
+load 843086.xhtml
--- a/layout/base/OverflowChangedTracker.h
+++ b/layout/base/OverflowChangedTracker.h
@@ -35,17 +35,18 @@ public:
   };
 
   OverflowChangedTracker() :
     mSubtreeRoot(nullptr)
   {}
 
   ~OverflowChangedTracker()
   {
-    NS_ASSERTION(mEntryList.empty(), "Need to flush before destroying!");
+    // XXXheycam Temporarily downgrade this assertion (bug 1324647).
+    NS_ASSERTION_STYLO_WARNING(mEntryList.empty(), "Need to flush before destroying!");
   }
 
   /**
    * Add a frame that has had a style change, and needs its
    * overflow updated.
    *
    * If there are pre-transform overflow areas stored for this
    * frame, then we will call FinishAndStoreOverflow with those
--- a/layout/base/crashtests/crashtests.list
+++ b/layout/base/crashtests/crashtests.list
@@ -446,26 +446,26 @@ load 860579-1.html
 load 866588.html
 load 876092.html
 load 876221.html
 load 897852.html
 asserts(4-6) asserts-if(Android&&!asyncPan,2) load 898913.html # bug 847368
 pref(layers.acceleration.disabled,true) pref(layers.force-active,true) load 919434.html
 load 926728.html
 load 930381.html
-asserts-if(stylo,1) load 931450.html # bug 1324647
+load 931450.html
 load 931460-1.html
 load 931464.html
 load 935765-1.html
 load 936988-1.html
 load 942690.html
 load 973390-1.html
 load 1001237.html
 load 1009036.html
-asserts-if(stylo,1) load 1043163-1.html # bug 1324647
+load 1043163-1.html
 load 1061028.html
 load 1107508-1.html
 load 1116104.html
 load 1127198-1.html
 load 1140198.html
 load 1143535.html
 pref(layout.css.grid.enabled,true) load 1156588.html
 load 1162813.xul
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -570,27 +570,27 @@ load 1003441.xul
 pref(layout.css.grid.enabled,true) load 1015562.html
 asserts(1-2) asserts-if(stylo,0) load 1015563-1.html
 asserts(1-2) asserts-if(stylo,0) load 1015563-2.html
 asserts(0-300) load 1015844.html # bug 574889
 pref(font.size.inflation.minTwips,200) load 1032450.html
 load 1032613-1.svg
 load 1032613-2.html
 load 1037903.html
-asserts-if(stylo,1) load 1039454-1.html # bug 1324647
+load 1039454-1.html
 load 1042489.html
-asserts-if(stylo,1) load 1054010-1.html # bug 1324647
+load 1054010-1.html
 load 1058954-1.html
 load 1134531.html
 load 1134667.html
 load 1137723-1.html
 load 1137723-2.html
 load 1140268-1.html
 load 1145768.html
-asserts-if(stylo,1) load 1146103.html # bug 1324647
+load 1146103.html
 load 1146107.html
 load 1146114.html
 asserts(0-20) load 1153478.html # bug 1144852
 load 1153695.html
 load 1156222.html
 pref(layout.css.grid.enabled,true) load 1156257.html
 skip-if(stylo) load 1157011.html # bug 1323697
 load 1169420-1.html
--- a/layout/svg/crashtests/crashtests.list
+++ b/layout/svg/crashtests/crashtests.list
@@ -18,17 +18,17 @@ load 327706-1.svg
 load 327709-1.svg
 load 327711-1.svg
 load 328137-1.svg
 load 329848-1.svg
 load 337408-1.xul
 load 338301-1.xhtml
 load 338312-1.xhtml
 load 340083-1.svg
-asserts-if(stylo,1) load 340945-1.svg # bug 1324647
+load 340945-1.svg
 load 342923-1.html
 load 343221-1.xhtml
 load 344749-1.svg
 load 344887-1.svg
 load 344892-1.svg
 load 344898-1.svg
 load 344904-1.svg
 load 345418-1.svg