mirror of
https://github.com/roytam1/UXP.git
synced 2026-05-26 13:49:07 +00:00
Issue #1629 - Part 5: Remove pointless local variables.
Since the local variable is always initialized to false, we don't actually need to declare it and can just pass "false" directly as a parameter to the PrepareSheet function's bool. I was worried about code readability at first, but some well-placed comments took care of that.
This commit is contained in:
@@ -2273,8 +2273,6 @@ Loader::LoadChildSheet(StyleSheet* aParentSheet,
|
||||
state = eSheetComplete;
|
||||
} else {
|
||||
bool isAlternate;
|
||||
// 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,
|
||||
@@ -2284,8 +2282,9 @@ Loader::LoadChildSheet(StyleSheet* aParentSheet,
|
||||
parentData ? parentData->mSyncLoad : false,
|
||||
false, empty, state, &isAlternate, &sheet);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
PrepareSheet(sheet, empty, empty, aMedia, nullptr, isAlternate, isExplicitlyEnabled);
|
||||
// For now, child sheets are not explicitly enabled (seventh argument is
|
||||
// always false here).
|
||||
PrepareSheet(sheet, empty, empty, aMedia, nullptr, isAlternate, false);
|
||||
}
|
||||
|
||||
rv = InsertChildSheet(sheet, aParentSheet, aParentRule);
|
||||
@@ -2398,9 +2397,6 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
|
||||
|
||||
StyleSheetState state;
|
||||
bool isAlternate;
|
||||
// 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();
|
||||
@@ -2410,7 +2406,10 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
|
||||
false, empty, state, &isAlternate, &sheet);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
PrepareSheet(sheet, empty, empty, nullptr, nullptr, isAlternate, isExplicitlyEnabled);
|
||||
// Sheets can only be explicitly enabled after creation and preparation, so
|
||||
// we always pass false for the initial value of the explicitly enabled flag
|
||||
// when calling PrepareSheet.
|
||||
PrepareSheet(sheet, empty, empty, nullptr, nullptr, isAlternate, false);
|
||||
|
||||
if (state == eSheetComplete) {
|
||||
LOG((" Sheet already complete"));
|
||||
|
||||
Reference in New Issue
Block a user