Bug 1359217 part 3 - Remove unused ErrorResult param from GetCssRulesInternal. r?heycam
MozReview-Commit-ID: KxUN9cCkoZG
--- a/layout/style/CSSStyleSheet.cpp
+++ b/layout/style/CSSStyleSheet.cpp
@@ -668,17 +668,17 @@ CSSStyleSheet::RegisterNamespaceRule(css
void
CSSStyleSheet::SetScopeElement(dom::Element* aScopeElement)
{
mScopeElement = aScopeElement;
}
CSSRuleList*
-CSSStyleSheet::GetCssRulesInternal(ErrorResult& aRv)
+CSSStyleSheet::GetCssRulesInternal()
{
if (!mRuleCollection) {
mRuleCollection = new CSSRuleListImpl(this);
}
return mRuleCollection;
}
uint32_t
--- a/layout/style/CSSStyleSheet.h
+++ b/layout/style/CSSStyleSheet.h
@@ -184,17 +184,17 @@ protected:
// Unlink our inner, if needed, for cycle collection
virtual void UnlinkInner() override;
// Traverse our inner, if needed, for cycle collection
virtual void TraverseInner(nsCycleCollectionTraversalCallback &) override;
protected:
// Internal methods which do not have security check and completeness check.
- dom::CSSRuleList* GetCssRulesInternal(ErrorResult& aRv);
+ dom::CSSRuleList* GetCssRulesInternal();
uint32_t InsertRuleInternal(const nsAString& aRule,
uint32_t aIndex, ErrorResult& aRv);
void DeleteRuleInternal(uint32_t aIndex, ErrorResult& aRv);
nsresult InsertRuleIntoGroupInternal(const nsAString& aRule,
css::GroupRule* aGroup,
uint32_t aIndex);
void EnabledStateChangedInternal();
--- a/layout/style/ServoStyleSheet.cpp
+++ b/layout/style/ServoStyleSheet.cpp
@@ -284,17 +284,17 @@ ServoStyleSheet::Clone(StyleSheet* aClon
static_cast<ServoStyleSheet*>(aCloneParent),
aCloneOwnerRule,
aCloneDocument,
aCloneOwningNode);
return clone.forget();
}
CSSRuleList*
-ServoStyleSheet::GetCssRulesInternal(ErrorResult& aRv)
+ServoStyleSheet::GetCssRulesInternal()
{
if (!mRuleList) {
EnsureUniqueInner();
RefPtr<ServoCssRules> rawRules =
Servo_StyleSheet_GetRules(Inner()->mSheet).Consume();
MOZ_ASSERT(rawRules);
mRuleList = new ServoCSSRuleList(rawRules.forget(), this);
@@ -302,17 +302,17 @@ ServoStyleSheet::GetCssRulesInternal(Err
return mRuleList;
}
uint32_t
ServoStyleSheet::InsertRuleInternal(const nsAString& aRule,
uint32_t aIndex, ErrorResult& aRv)
{
// Ensure mRuleList is constructed.
- GetCssRulesInternal(aRv);
+ GetCssRulesInternal();
mozAutoDocUpdate updateBatch(mDocument, UPDATE_STYLE, true);
aRv = mRuleList->InsertRule(aRule, aIndex);
if (aRv.Failed()) {
return 0;
}
if (mDocument) {
if (mRuleList->GetRuleType(aIndex) != css::Rule::IMPORT_RULE ||
@@ -324,17 +324,17 @@ ServoStyleSheet::InsertRuleInternal(cons
}
return aIndex;
}
void
ServoStyleSheet::DeleteRuleInternal(uint32_t aIndex, ErrorResult& aRv)
{
// Ensure mRuleList is constructed.
- GetCssRulesInternal(aRv);
+ GetCssRulesInternal();
if (aIndex > mRuleList->Length()) {
aRv.Throw(NS_ERROR_DOM_INDEX_SIZE_ERR);
return;
}
mozAutoDocUpdate updateBatch(mDocument, UPDATE_STYLE, true);
// Hold a strong ref to the rule so it doesn't die when we remove it
// from the list. XXX We may not want to hold it if stylesheet change
--- a/layout/style/ServoStyleSheet.h
+++ b/layout/style/ServoStyleSheet.h
@@ -124,17 +124,17 @@ protected:
void LastRelease();
ServoStyleSheetInner* Inner() const
{
return static_cast<ServoStyleSheetInner*>(mInner);
}
// Internal methods which do not have security check and completeness check.
- dom::CSSRuleList* GetCssRulesInternal(ErrorResult& aRv);
+ dom::CSSRuleList* GetCssRulesInternal();
uint32_t InsertRuleInternal(const nsAString& aRule,
uint32_t aIndex, ErrorResult& aRv);
void DeleteRuleInternal(uint32_t aIndex, ErrorResult& aRv);
nsresult InsertRuleIntoGroupInternal(const nsAString& aRule,
css::GroupRule* aGroup,
uint32_t aIndex);
void EnabledStateChangedInternal() {}
--- a/layout/style/StyleSheet.cpp
+++ b/layout/style/StyleSheet.cpp
@@ -492,17 +492,17 @@ StyleSheet::AppendAllChildSheets(nsTArra
dom::CSSRuleList*
StyleSheet::GetCssRules(nsIPrincipal& aSubjectPrincipal,
ErrorResult& aRv)
{
if (!AreRulesAvailable(aSubjectPrincipal, aRv)) {
return nullptr;
}
- FORWARD_INTERNAL(GetCssRulesInternal, (aRv))
+ FORWARD_INTERNAL(GetCssRulesInternal, ())
}
css::Rule*
StyleSheet::GetDOMOwnerRule() const
{
return mOwnerRule;
}