--- a/dom/base/nsMappedAttributeElement.cpp
+++ b/dom/base/nsMappedAttributeElement.cpp
@@ -22,18 +22,18 @@ nsMappedAttributeElement::SetAndSwapMapp
 
 nsMapRuleToAttributesFunc
 nsMappedAttributeElement::GetAttributeMappingFunction() const
 {
   return &MapNoAttributesInto;
 }
 
 void
-nsMappedAttributeElement::MapNoAttributesInto(const nsMappedAttributes* aAttributes,
-                                              mozilla::GenericSpecifiedValues* aGenericData)
+nsMappedAttributeElement::MapNoAttributesInto(const nsMappedAttributes*,
+                                              mozilla::MappedDeclarations&)
 {
 }
 
 void
 nsMappedAttributeElement::NodeInfoChanged(nsIDocument* aOldDoc)
 {
   nsHTMLStyleSheet* sheet = OwnerDoc()->GetAttributeStyleSheet();
   mAttrsAndChildren.SetMappedAttrStyleSheet(sheet);

--- a/dom/html/HTMLObjectElement.cpp
+++ b/dom/html/HTMLObjectElement.cpp
@@ -460,18 +460,18 @@ HTMLObjectElement::ParseAttribute(int32_
     }
   }
 
   return nsGenericHTMLFormElement::ParseAttribute(aNamespaceID, aAttribute,
                                                   aValue, aMaybeScriptedPrincipal, aResult);
 }
 
 void
-HTMLObjectElement::MapAttributesIntoRule(const nsMappedAttributes *aAttributes,
-                                         GenericSpecifiedValues *aData)
+HTMLObjectElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes,
+                                         MappedDeclarations& aDecls)
 {
   nsGenericHTMLFormElement::MapImageAlignAttributeInto(aAttributes, aDecls);
   nsGenericHTMLFormElement::MapImageBorderAttributeInto(aAttributes, aDecls);
   nsGenericHTMLFormElement::MapImageMarginAttributeInto(aAttributes, aDecls);
   nsGenericHTMLFormElement::MapImageSizeAttributesInto(aAttributes, aDecls);
   nsGenericHTMLFormElement::MapCommonAttributesInto(aAttributes, aDecls);
 }