Bug 1599843 - Element::SetSMILOverrideStyleDeclaration is infallible. r=boris

Differential Revision: https://phabricator.services.mozilla.com/D54996

--HG--
extra : moz-landing-system : lando

dom/base/Element.cpp

@@ -1835,11 +1835,8 @@ DeclarationBlock* Element::GetSMILOverrideStyleDeclaration() {
   return slots ? slots->mSMILOverrideStyleDeclaration.get() : nullptr;
 }
 
-nsresult Element::SetSMILOverrideStyleDeclaration(
+void Element::SetSMILOverrideStyleDeclaration(DeclarationBlock& aDeclaration) {
-    DeclarationBlock* aDeclaration) {
+  ExtendedDOMSlots()->mSMILOverrideStyleDeclaration = &aDeclaration;
-  Element::nsExtendedDOMSlots* slots = ExtendedDOMSlots();
-
-  slots->mSMILOverrideStyleDeclaration = aDeclaration;
 
   // Only need to request a restyle if we're in a document.  (We might not
   // be in a document, if we're clearing animation effects on a target node
@@ -1849,8 +1846,6 @@ nsresult Element::SetSMILOverrideStyleDeclaration(
       presShell->RestyleForAnimation(this, StyleRestyleHint_RESTYLE_SMIL);
     }
   }
-
-  return NS_OK;
 }
 
 bool Element::IsLabelable() const { return false; }

dom/base/Element.h

@@ -336,7 +336,7 @@ class Element : public FragmentOrElement {
    * notify the document's pres context, so that the style changes will be
    * noticed.
    */
-  nsresult SetSMILOverrideStyleDeclaration(DeclarationBlock* aDeclaration);
+  void SetSMILOverrideStyleDeclaration(DeclarationBlock&);
 
   /**
    * Returns a new SMILAttr that allows the caller to animate the given

layout/style/nsDOMCSSAttrDeclaration.cpp

@@ -79,9 +79,11 @@ nsresult nsDOMCSSAttributeDeclaration::SetCSSDeclaration(
   MOZ_ASSERT_IF(aClosureData, !aClosureData->mClosure);
 
   aDecl->SetDirty();
-  return mIsSMILOverride
+  if (mIsSMILOverride) {
-             ? mElement->SetSMILOverrideStyleDeclaration(aDecl)
+    mElement->SetSMILOverrideStyleDeclaration(*aDecl);
-             : mElement->SetInlineStyleDeclaration(*aDecl, *aClosureData);
+    return NS_OK;
+  }
+  return mElement->SetInlineStyleDeclaration(*aDecl, *aClosureData);
 }
 
 Document* nsDOMCSSAttributeDeclaration::DocToUpdate() {