Issue #1629 - Part 4: Ensure isExplicitlyEnabled is false upon sheet creation.

This clarifies the assumptions the code is making and the order in which the variables pass through the loading process. The new variable is set after the sheet is created and prepared, and is assumed to be false in the beginning.

1 files changed, 5 insertions, 2 deletions

diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp
index c211992381..5ca319b3f5 100644
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -2273,7 +2273,8 @@ Loader::LoadChildSheet(StyleSheet* aParentSheet,
     state = eSheetComplete;
   } else {
     bool isAlternate;
-    bool isExplicitlyEnabled;
+    // For now, child sheets are not explicitly enabled.
+    bool isExplicitlyEnabled = false;
     const nsSubstring& empty = EmptyString();
     // For now, use CORS_NONE for child sheets
     rv = CreateSheet(aURL, nullptr, principal,
@@ -2397,7 +2398,9 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
 
   StyleSheetState state;
   bool isAlternate;
-  bool isExplicitlyEnabled;
+  // Sheets can only be explicitly enabled after creation and preparation, so
+  // set isExplicitlyEnabled to false.
+  bool isExplicitlyEnabled = false;
   RefPtr<StyleSheet> sheet;
   bool syncLoad = (aObserver == nullptr);
   const nsSubstring& empty = EmptyString();