diff --git a/content/html/content/src/nsHTMLDivElement.cpp b/content/html/content/src/nsHTMLDivElement.cpp
index addd2481dbf2..9dc85c488120 100644
--- a/content/html/content/src/nsHTMLDivElement.cpp
+++ b/content/html/content/src/nsHTMLDivElement.cpp
@@ -133,7 +133,7 @@ nsHTMLDivElement::StringToAttribute(nsIAtom* aAttribute,
                                     nsHTMLValue& aResult)
 {
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseDivAlignValue(aValue, aResult)) {
+    if (mInner.ParseDivAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -163,7 +163,7 @@ nsHTMLDivElement::AttributeToString(nsIAtom* aAttribute,
 {
   if (aAttribute == nsHTMLAtoms::align) {
     if (eHTMLUnit_Enumerated == aValue.GetUnit()) {
-      nsGenericHTMLElement::DivAlignValueToString(aValue, aResult);
+      mInner.DivAlignValueToString(aValue, aResult);
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/content/html/content/src/nsHTMLHeadingElement.cpp b/content/html/content/src/nsHTMLHeadingElement.cpp
index 9afc2fce4ee3..d0ac28eab83d 100644
--- a/content/html/content/src/nsHTMLHeadingElement.cpp
+++ b/content/html/content/src/nsHTMLHeadingElement.cpp
@@ -131,7 +131,7 @@ nsHTMLHeadingElement::StringToAttribute(nsIAtom* aAttribute,
                                         nsHTMLValue& aResult)
 {
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseDivAlignValue(aValue, aResult)) {
+    if (mInner.ParseDivAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -145,7 +145,7 @@ nsHTMLHeadingElement::AttributeToString(nsIAtom* aAttribute,
 {
   if (aAttribute == nsHTMLAtoms::align) {
     if (eHTMLUnit_Enumerated == aValue.GetUnit()) {
-      nsGenericHTMLElement::DivAlignValueToString(aValue, aResult);
+      mInner.DivAlignValueToString(aValue, aResult);
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/content/html/content/src/nsHTMLParagraphElement.cpp b/content/html/content/src/nsHTMLParagraphElement.cpp
index f5eefff8d612..0427fd5974f3 100644
--- a/content/html/content/src/nsHTMLParagraphElement.cpp
+++ b/content/html/content/src/nsHTMLParagraphElement.cpp
@@ -138,7 +138,7 @@ nsHTMLParagraphElement::StringToAttribute(nsIAtom* aAttribute,
                                           nsHTMLValue& aResult)
 {
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseDivAlignValue(aValue, aResult)) {
+    if (mInner.ParseDivAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -152,7 +152,7 @@ nsHTMLParagraphElement::AttributeToString(nsIAtom* aAttribute,
 {
   if (aAttribute == nsHTMLAtoms::align) {
     if (eHTMLUnit_Enumerated == aValue.GetUnit()) {
-      nsGenericHTMLElement::DivAlignValueToString(aValue, aResult);
+      mInner.DivAlignValueToString(aValue, aResult);
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/layout/html/content/src/nsHTMLDivElement.cpp b/layout/html/content/src/nsHTMLDivElement.cpp
index addd2481dbf2..9dc85c488120 100644
--- a/layout/html/content/src/nsHTMLDivElement.cpp
+++ b/layout/html/content/src/nsHTMLDivElement.cpp
@@ -133,7 +133,7 @@ nsHTMLDivElement::StringToAttribute(nsIAtom* aAttribute,
                                     nsHTMLValue& aResult)
 {
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseDivAlignValue(aValue, aResult)) {
+    if (mInner.ParseDivAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -163,7 +163,7 @@ nsHTMLDivElement::AttributeToString(nsIAtom* aAttribute,
 {
   if (aAttribute == nsHTMLAtoms::align) {
     if (eHTMLUnit_Enumerated == aValue.GetUnit()) {
-      nsGenericHTMLElement::DivAlignValueToString(aValue, aResult);
+      mInner.DivAlignValueToString(aValue, aResult);
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/layout/html/content/src/nsHTMLHeadingElement.cpp b/layout/html/content/src/nsHTMLHeadingElement.cpp
index 9afc2fce4ee3..d0ac28eab83d 100644
--- a/layout/html/content/src/nsHTMLHeadingElement.cpp
+++ b/layout/html/content/src/nsHTMLHeadingElement.cpp
@@ -131,7 +131,7 @@ nsHTMLHeadingElement::StringToAttribute(nsIAtom* aAttribute,
                                         nsHTMLValue& aResult)
 {
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseDivAlignValue(aValue, aResult)) {
+    if (mInner.ParseDivAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -145,7 +145,7 @@ nsHTMLHeadingElement::AttributeToString(nsIAtom* aAttribute,
 {
   if (aAttribute == nsHTMLAtoms::align) {
     if (eHTMLUnit_Enumerated == aValue.GetUnit()) {
-      nsGenericHTMLElement::DivAlignValueToString(aValue, aResult);
+      mInner.DivAlignValueToString(aValue, aResult);
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/layout/html/content/src/nsHTMLParagraphElement.cpp b/layout/html/content/src/nsHTMLParagraphElement.cpp
index f5eefff8d612..0427fd5974f3 100644
--- a/layout/html/content/src/nsHTMLParagraphElement.cpp
+++ b/layout/html/content/src/nsHTMLParagraphElement.cpp
@@ -138,7 +138,7 @@ nsHTMLParagraphElement::StringToAttribute(nsIAtom* aAttribute,
                                           nsHTMLValue& aResult)
 {
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseDivAlignValue(aValue, aResult)) {
+    if (mInner.ParseDivAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -152,7 +152,7 @@ nsHTMLParagraphElement::AttributeToString(nsIAtom* aAttribute,
 {
   if (aAttribute == nsHTMLAtoms::align) {
     if (eHTMLUnit_Enumerated == aValue.GetUnit()) {
-      nsGenericHTMLElement::DivAlignValueToString(aValue, aResult);
+      mInner.DivAlignValueToString(aValue, aResult);
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }