mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-13 13:25:37 +00:00
Bug 1470420: Make InsertChildSheet infallible. r=xidorn
MozReview-Commit-ID: 4bkwzSZ2ByZ
This commit is contained in:
parent
35b0e15ead
commit
c3f12726ac
@ -1249,20 +1249,17 @@ Loader::InsertSheetInTree(StyleSheet& aSheet, nsIContent* aLinkingContent)
|
||||
* restore CSSStyleSheet::InsertStyleSheetAt, which was removed in
|
||||
* bug 1220506.)
|
||||
*/
|
||||
nsresult
|
||||
Loader::InsertChildSheet(StyleSheet* aSheet, StyleSheet* aParentSheet)
|
||||
void
|
||||
Loader::InsertChildSheet(StyleSheet& aSheet, StyleSheet& aParentSheet)
|
||||
{
|
||||
LOG(("css::Loader::InsertChildSheet"));
|
||||
MOZ_ASSERT(aSheet, "Nothing to insert");
|
||||
MOZ_ASSERT(aParentSheet, "Need a parent to insert into");
|
||||
|
||||
// child sheets should always start out enabled, even if they got
|
||||
// cloned off of top-level sheets which were disabled
|
||||
aSheet->SetEnabled(true);
|
||||
aParentSheet->PrependStyleSheet(aSheet);
|
||||
aSheet.SetEnabled(true);
|
||||
aParentSheet.PrependStyleSheet(&aSheet);
|
||||
|
||||
LOG((" Inserting into parent sheet"));
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -2228,8 +2225,8 @@ Loader::LoadChildSheet(StyleSheet* aParentSheet,
|
||||
PrepareSheet(sheet, empty, empty, aMedia, IsAlternate::No);
|
||||
}
|
||||
|
||||
rv = InsertChildSheet(sheet, aParentSheet);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
MOZ_ASSERT(sheet);
|
||||
InsertChildSheet(*sheet, *aParentSheet);
|
||||
|
||||
if (state == eSheetComplete) {
|
||||
LOG((" Sheet already complete"));
|
||||
|
@ -510,9 +510,8 @@ private:
|
||||
|
||||
// Inserts a style sheet in a document or a ShadowRoot.
|
||||
void InsertSheetInTree(StyleSheet& aSheet, nsIContent* aLinkingContent);
|
||||
|
||||
nsresult InsertChildSheet(StyleSheet* aSheet,
|
||||
StyleSheet* aParentSheet);
|
||||
// Inserts a style sheet into a parent style sheet.
|
||||
void InsertChildSheet(StyleSheet& aSheet, StyleSheet& aParentSheet);
|
||||
|
||||
nsresult InternalLoadNonDocumentSheet(
|
||||
nsIURI* aURL,
|
||||
|
Loading…
Reference in New Issue
Block a user