Bug 1314045 - stylo: Downgrade "Bad loading table" assertion since it occurs frequently. r=me
☠☠ backed out by 959f53ed7fad ☠ ☠
authorCameron McCormack <cam@mcc.id.au>
Tue, 31 Jan 2017 23:36:21 +0800
changeset 331822 4787d54f7aa6e8a328e46139b848bf157c2fc351
parent 331821 ad45a3da5e4ad5adcd5598cf2be93dcd03992e96
child 331823 7771169d9f8adf2bf4e271e41b23b1073b0d3dd9
push id86363
push usercmccormack@mozilla.com
push dateTue, 31 Jan 2017 15:37:15 +0000
treeherdermozilla-inbound@e3687105be00 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1314045
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 1314045 - stylo: Downgrade "Bad loading table" assertion since it occurs frequently. r=me MozReview-Commit-ID: Hdt37MzhdsZ
dom/html/crashtests/crashtests.list
dom/jsurl/crashtests/crashtests.list
layout/generic/crashtests/crashtests.list
layout/style/Loader.cpp
layout/style/ServoUtils.h
layout/style/crashtests/crashtests.list
netwerk/test/crashtests/crashtests.list
parser/htmlparser/tests/crashtests/crashtests.list
--- a/dom/html/crashtests/crashtests.list
+++ b/dom/html/crashtests/crashtests.list
@@ -46,17 +46,17 @@ load 614988-1.html
 load 620078-1.html
 load 620078-2.html
 load 631421.html
 load 673853.html
 load 680922-1.xul
 load 682058.xhtml
 load 682460.html
 load 738744.xhtml
-asserts-if(stylo,6-30) load 741218.json # bug 1324634
+load 741218.json
 load 741250.xhtml
 load 795221-1.html
 asserts-if(stylo,1) load 795221-2.html # bug 1324702
 load 795221-3.html
 load 795221-4.html
 load 795221-5.xml
 load 811226.html
 load 819745.html
--- a/dom/jsurl/crashtests/crashtests.list
+++ b/dom/jsurl/crashtests/crashtests.list
@@ -1,6 +1,6 @@
 load 341963-1.html
 load 344874-1.html
 load 344996-1.xhtml
-asserts-if(stylo,4) load 457050-1.html # bug 1324634
+load 457050-1.html
 load 1018583.html
 load 1180389.html
--- a/layout/generic/crashtests/crashtests.list
+++ b/layout/generic/crashtests/crashtests.list
@@ -453,17 +453,17 @@ load 646983-1.html
 load 647332-1.html
 load 650499-1.html
 load 654002-1.html
 load 654002-2.html
 load 655462-1.html
 load 656130-1.html
 load 656130-2.html
 load 660416.html
-asserts-if(stylo,2) load 665853.html # bug 1324634
+load 665853.html
 load 667025.html
 skip-if(stylo) load 673770.html # bug 1323652
 load 679933-1.html
 load 681489-1.html
 load 682649-1.html
 load 683702-1.xhtml
 load 683712.html
 load 688996-1.html
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -52,16 +52,17 @@
 #include "nsINetworkPredictor.h"
 #include "mozilla/dom/ShadowRoot.h"
 #include "mozilla/dom/URL.h"
 #include "mozilla/AsyncEventDispatcher.h"
 #include "mozilla/ServoBindings.h"
 #include "mozilla/StyleSheet.h"
 #include "mozilla/StyleSheetInlines.h"
 #include "mozilla/ConsoleReportCollector.h"
+#include "mozilla/ServoUtils.h"
 
 #ifdef MOZ_XUL
 #include "nsXULPrototypeCache.h"
 #endif
 
 #include "nsMediaList.h"
 #include "nsIDOMStyleSheet.h"
 #include "nsError.h"
@@ -1872,19 +1873,21 @@ Loader::DoSheetComplete(SheetLoadData* a
     // Remove the data from the list of loading datas
     if (aLoadData->mIsLoading) {
       URIPrincipalReferrerPolicyAndCORSModeHashKey key(aLoadData->mURI,
                                          aLoadData->mLoaderPrincipal,
                                          aLoadData->mSheet->GetCORSMode(),
                                          aLoadData->mSheet->GetReferrerPolicy());
 #ifdef DEBUG
       SheetLoadData *loadingData;
-      NS_ASSERTION(mSheets->mLoadingDatas.Get(&key, &loadingData) &&
-                   loadingData == aLoadData,
-                   "Bad loading table");
+      // XXXheycam Temporarily downgrade this assertion (bug 1314045).
+      NS_ASSERTION_STYLO_WARNING(
+        mSheets->mLoadingDatas.Get(&key, &loadingData) &&
+        loadingData == aLoadData,
+        "Bad loading table");
 #endif
 
       mSheets->mLoadingDatas.Remove(&key);
       aLoadData->mIsLoading = false;
     }
   }
 
   // Go through and deal with the whole linked list.
--- a/layout/style/ServoUtils.h
+++ b/layout/style/ServoUtils.h
@@ -74,9 +74,16 @@
   if (IsServo()) {                                                          \
     return AsServo()->method_ servoargs_;                                   \
   }                                                                         \
   return AsGecko()->method_ geckoargs_;
 
 #define MOZ_STYLO_FORWARD(method_, args_) \
   MOZ_STYLO_FORWARD_CONCRETE(method_, args_, args_)
 
+// Warning in MOZ_STYLO builds and non-fatally assert in regular builds.
+#ifdef MOZ_STYLO
+#define NS_ASSERTION_STYLO_WARNING(...) NS_WARNING_ASSERTION(__VA_ARGS__)
+#else
+#define NS_ASSERTION_STYLO_WARNING(...) NS_ASSERTION(__VA_ARGS__)
+#endif
+
 #endif // mozilla_ServoUtils_h
--- a/layout/style/crashtests/crashtests.list
+++ b/layout/style/crashtests/crashtests.list
@@ -13,17 +13,17 @@ load 379788-1.html
 load 383979-1.xhtml
 load 383979-2.html
 load 386939-1.html
 load 391034-1.xhtml
 asserts-if(stylo,1) load 397022-1.html # bug 1324704
 load 399289-1.svg
 load 404470-1.html
 load 411603-1.html
-asserts-if(stylo,2) load 412588-1.html # bug 1324634
+load 412588-1.html
 load 413274-1.xhtml
 load 416461-1.xul
 load 418007-1.xhtml
 load 431705-1.xul
 skip-if(stylo) load 432561-1.html # bug 1323705
 load 437170-1.html
 load 437532-1.html
 skip-if(stylo) load 439184-1.html # bug 1323939
@@ -32,29 +32,29 @@ load 444848-1.html
 load 447776-1.html
 load 447783-1.html
 load 448161-1.html
 load 448161-2.html
 load 452150-1.xhtml
 skip-if(stylo) load 456196.html # bug 132652
 load 460209-1.html
 load 460217-1.html
-asserts-if(stylo,2) load 460323-1.html # bug 1324634
+load 460323-1.html
 load 466845-1.html
 load 469432-1.xhtml
 load 472195-1.html
 load 472237-1.html # will fail, test for leak (474704)
 HTTP(..) load 472237-1.html
 load 473720-1.html
 load 473892-1.html
 load 473914-1.html
 load 474377-1.xhtml
 load 478321-1.xhtml
-asserts-if(stylo,3) load 495269-1.html # bug 1324634
-asserts-if(stylo,3) load 495269-2.html # bug 1324634
+load 495269-1.html
+load 495269-2.html
 load 498036-1.html
 load 509155-1.html
 load 509156-1.html
 load 509569-1.html
 load 512851-1.xhtml
 load 524252-1.html
 load 536789-1.html
 load 539613-1.xhtml
@@ -63,17 +63,17 @@ load 559491.html
 load 565248-1.html
 load 571105-1.xhtml
 load 573127-1.html
 load 575464-1.html
 load 580685.html
 load 585185-1.html
 load 588627-1.html
 load 592698-1.html
-asserts-if(stylo,2) load 601437-1.html # bug 1324634
+load 601437-1.html
 load 601439-1.html
 load 605689-1.html
 load 611922-1.html
 load 621596-1.html
 load 622314-1.xhtml
 load 637242.xhtml
 load 645142.html
 fails-if(stylo) asserts-if(stylo,3-4) == 645951-1.html 645951-1-ref.html # bug 1324621
@@ -95,17 +95,17 @@ load 812824.html
 load 822766-1.html
 load 822842.html
 load 827591-1.html
 load 829817.html
 load 840898.html
 load 842134.html
 load 861489-1.html
 load 862113.html
-asserts-if(stylo,5) load 867487.html # bug 1324634
+load 867487.html
 load 873222.html
 asserts-if(stylo,2) load 880862.html # bug 1324701
 load 894245-1.html
 load 915440.html
 load 927734-1.html
 load 930270-1.html
 load 930270-2.html
 load 945048-1.html
--- a/netwerk/test/crashtests/crashtests.list
+++ b/netwerk/test/crashtests/crashtests.list
@@ -1,3 +1,3 @@
-asserts-if(stylo,4) load 785753-1.html # bug 1324634
-asserts-if(stylo,4) load 785753-2.html # bug 1324634
+load 785753-1.html
+load 785753-2.html
 load 1274044-1.html
--- a/parser/htmlparser/tests/crashtests/crashtests.list
+++ b/parser/htmlparser/tests/crashtests/crashtests.list
@@ -1,11 +1,11 @@
 load 30885-1.html
 load 30956-1.html
-asserts-if(stylo,2) load 31392-1.html # bug 1324634
+load 31392-1.html
 load 31694-1.html
 load 31940-1.html
 load 32613-1.html
 load 34168-1.html
 load 34168-1.xml
 load 41427-1.html
 load 44178-1.html
 load 46495-1.html