Bug 1314045 Part 1: Return load table assertion to full force now that Servo stylesheet caching will keep load table consistent. draft
authorBrad Werth <bwerth@mozilla.com>
Fri, 10 Mar 2017 16:57:36 -0800
changeset 496965 031992d13bb2fc06f63d266ad9591ef2b7c67842
parent 496768 a8d497b09753c91783b68c5805c64f34a2f39629
child 548769 655dd5984f7ece80411812be97fc275827b4d996
push id48763
push userbwerth@mozilla.com
push dateSat, 11 Mar 2017 00:59:05 +0000
bugs1314045
milestone55.0a1
Bug 1314045 Part 1: Return load table assertion to full force now that Servo stylesheet caching will keep load table consistent. MozReview-Commit-ID: 7IrwZ5oFc6e
layout/style/Loader.cpp
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -1881,18 +1881,17 @@ 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;
-      // XXXheycam Temporarily downgrade this assertion (bug 1314045).
-      NS_ASSERTION_STYLO_WARNING(
+      NS_ASSERTION(
         mSheets->mLoadingDatas.Get(&key, &loadingData) &&
         loadingData == aLoadData,
         "Bad loading table");
 #endif
 
       mSheets->mLoadingDatas.Remove(&key);
       aLoadData->mIsLoading = false;
     }