Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-26 19:55:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1403694: Fix a case where a NULL stylesheet would be added to the nsStyleSheetService if nsLayoutUtils::StyloSupportedInCurrentProcess() returns false. r=xidorn

Browse Source 
MozReview-Commit-ID: COaDbr49B7B

--HG--
extra : rebase_source : c4cb37f2f57444af41eccfb93d0e73895e4ae7b8
This commit is contained in:
Brad Werth 2017-09-28 16:45:09 -07:00
parent 934012625c
commit 17d09b7ae1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/base/nsStyleSheetService.cpp
View File

@ -251,23 +251,23 @@ nsStyleSheetService::LoadAndRegisterSheetInternal(nsIURI *aSheetURI,
nsresult rv;
RefPtr<StyleSheet> geckoSheet;
RefPtr<StyleSheet> servoSheet;
rv = LoadSheet(aSheetURI, parsingMode, StyleBackendType::Gecko, &geckoSheet);
NS_ENSURE_SUCCESS(rv, rv);
MOZ_ASSERT(geckoSheet);
mGeckoSheets[aSheetType].AppendElement(geckoSheet);
#ifdef MOZ_STYLO
if (nsLayoutUtils::StyloSupportedInCurrentProcess()) {
RefPtr<StyleSheet> servoSheet;
rv = LoadSheet(aSheetURI, parsingMode, StyleBackendType::Servo, &servoSheet);
NS_ENSURE_SUCCESS(rv, rv);
MOZ_ASSERT(servoSheet);
mServoSheets[aSheetType].AppendElement(servoSheet);
}
#endif
mGeckoSheets[aSheetType].AppendElement(geckoSheet);
mServoSheets[aSheetType].AppendElement(servoSheet);
return NS_OK;
}