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.
This commit is contained in:
athenian200 2020-09-06 13:51:08 -05:00 committed by roytam1
commit f04339dd5a

View file

@ -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();