diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
index 82b04779604..d84a977b153 100644
--- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
@@ -1690,20 +1690,6 @@ static nsGenericHTMLElement::EnumTable kScrollingStandardTable[] = {
   { 0 }
 };
 
-static nsGenericHTMLElement::EnumTable kTableHAlignTable[] = {
-  { "left",   NS_STYLE_TEXT_ALIGN_LEFT },
-  { "right",  NS_STYLE_TEXT_ALIGN_RIGHT },
-  { "center", NS_STYLE_TEXT_ALIGN_CENTER },
-  { "char",   NS_STYLE_TEXT_ALIGN_CHAR },
-  { "justify",NS_STYLE_TEXT_ALIGN_JUSTIFY },
-
-  // The following are non-standard but necessary for Nav4 compatibility
-  { "middle", NS_STYLE_TEXT_ALIGN_CENTER },
-  { "absmiddle", NS_STYLE_TEXT_ALIGN_CENTER },
-
-  { 0 }
-};
-
 static nsGenericHTMLElement::EnumTable kTableVAlignTable[] = {
   { "top",     NS_STYLE_VERTICAL_ALIGN_TOP },
   { "middle",  NS_STYLE_VERTICAL_ALIGN_MIDDLE },
@@ -1730,13 +1716,91 @@ nsGenericHTMLElement::ParseAlignValue(const nsString& aString,
   return ParseEnumValue(aString, kAlignTable, aResult);
 }
 
+//----------------------------------------
+
+// Vanilla table as defined by the html4 spec...
+static nsGenericHTMLElement::EnumTable kTableHAlignTable[] = {
+  { "left",   NS_STYLE_TEXT_ALIGN_LEFT },
+  { "right",  NS_STYLE_TEXT_ALIGN_RIGHT },
+  { "center", NS_STYLE_TEXT_ALIGN_CENTER },
+  { "char",   NS_STYLE_TEXT_ALIGN_CHAR },
+  { "justify",NS_STYLE_TEXT_ALIGN_JUSTIFY },
+  { 0 }
+};
+
+// This table is used for TABLE when in compatability mode
+static nsGenericHTMLElement::EnumTable kCompatTableHAlignTable[] = {
+  { "left",   NS_STYLE_TEXT_ALIGN_LEFT },
+  { "right",  NS_STYLE_TEXT_ALIGN_RIGHT },
+  { "center", NS_STYLE_TEXT_ALIGN_CENTER },
+  { "char",   NS_STYLE_TEXT_ALIGN_CHAR },
+  { "justify",NS_STYLE_TEXT_ALIGN_JUSTIFY },
+  { "abscenter", NS_STYLE_TEXT_ALIGN_CENTER },
+  { 0 }
+};
+
 PRBool
 nsGenericHTMLElement::ParseTableHAlignValue(const nsString& aString,
-                                            nsHTMLValue& aResult)
+                                            nsHTMLValue& aResult) const
 {
+  if (InNavQuirksMode()) {
+    return ParseEnumValue(aString, kCompatTableHAlignTable, aResult);
+  }
   return ParseEnumValue(aString, kTableHAlignTable, aResult);
 }
 
+PRBool
+nsGenericHTMLElement::TableHAlignValueToString(const nsHTMLValue& aValue,
+                                               nsString& aResult) const
+{
+  if (InNavQuirksMode()) {
+    return EnumValueToString(aValue, kCompatTableHAlignTable, aResult);
+  }
+  return EnumValueToString(aValue, kTableHAlignTable, aResult);
+}
+
+//----------------------------------------
+
+// This table is used for TD,TH,TR, etc (but not TABLE) when in
+// compatability mode
+static nsGenericHTMLElement::EnumTable kCompatTableCellHAlignTable[] = {
+  { "left",   NS_STYLE_TEXT_ALIGN_LEFT },
+  // Note: use compatible version of alignment constants so that
+  // nested tables will be right aligned or center aligned.
+  { "right",  NS_STYLE_TEXT_ALIGN_MOZ_RIGHT },
+  { "center", NS_STYLE_TEXT_ALIGN_MOZ_CENTER },
+  { "char",   NS_STYLE_TEXT_ALIGN_CHAR },
+  { "justify",NS_STYLE_TEXT_ALIGN_JUSTIFY },
+
+  // The following are non-standard but necessary for Nav4 compatibility
+  { "middle", NS_STYLE_TEXT_ALIGN_CENTER },
+  { "absmiddle", NS_STYLE_TEXT_ALIGN_CENTER },// XXX is this right???
+
+  { 0 }
+};
+
+PRBool
+nsGenericHTMLElement::ParseTableCellHAlignValue(const nsString& aString,
+                                                nsHTMLValue& aResult) const
+{
+  if (InNavQuirksMode()) {
+    return ParseEnumValue(aString, kCompatTableCellHAlignTable, aResult);
+  }
+  return ParseEnumValue(aString, kTableHAlignTable, aResult);
+}
+
+PRBool
+nsGenericHTMLElement::TableCellHAlignValueToString(const nsHTMLValue& aValue,
+                                                   nsString& aResult) const
+{
+  if (InNavQuirksMode()) {
+    return EnumValueToString(aValue, kCompatTableCellHAlignTable, aResult);
+  }
+  return EnumValueToString(aValue, kTableHAlignTable, aResult);
+}
+
+//----------------------------------------
+
 PRBool
 nsGenericHTMLElement::ParseTableVAlignValue(const nsString& aString,
                                             nsHTMLValue& aResult)
@@ -1751,13 +1815,6 @@ nsGenericHTMLElement::AlignValueToString(const nsHTMLValue& aValue,
   return EnumValueToString(aValue, kAlignTable, aResult);
 }
 
-PRBool
-nsGenericHTMLElement::TableHAlignValueToString(const nsHTMLValue& aValue,
-                                               nsString& aResult)
-{
-  return EnumValueToString(aValue, kTableHAlignTable, aResult);
-}
-
 PRBool
 nsGenericHTMLElement::TableVAlignValueToString(const nsHTMLValue& aValue,
                                                nsString& aResult)
diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.h b/mozilla/content/html/content/src/nsGenericHTMLElement.h
index ab0fb6d615a..41869746a51 100644
--- a/mozilla/content/html/content/src/nsGenericHTMLElement.h
+++ b/mozilla/content/html/content/src/nsGenericHTMLElement.h
@@ -189,25 +189,28 @@ public:
 
   PRBool ParseDivAlignValue(const nsString& aString,
                             nsHTMLValue& aResult) const;
+  PRBool DivAlignValueToString(const nsHTMLValue& aValue,
+                               nsString& aResult) const;
 
-  static PRBool ParseTableHAlignValue(const nsString& aString,
-                                      nsHTMLValue& aResult);
+  PRBool ParseTableHAlignValue(const nsString& aString,
+                               nsHTMLValue& aResult) const;
+  PRBool TableHAlignValueToString(const nsHTMLValue& aValue,
+                                  nsString& aResult) const;
+
+  PRBool ParseTableCellHAlignValue(const nsString& aString,
+                                   nsHTMLValue& aResult) const;
+  PRBool TableCellHAlignValueToString(const nsHTMLValue& aValue,
+                                      nsString& aResult) const;
 
   static PRBool ParseTableVAlignValue(const nsString& aString,
                                       nsHTMLValue& aResult);
 
-  static PRBool TableHAlignValueToString(const nsHTMLValue& aValue,
-                                         nsString& aResult);
-
   static PRBool TableVAlignValueToString(const nsHTMLValue& aValue,
                                          nsString& aResult);
 
   static PRBool AlignValueToString(const nsHTMLValue& aValue,
                                    nsString& aResult);
 
-  PRBool DivAlignValueToString(const nsHTMLValue& aValue,
-                               nsString& aResult) const;
-
   static PRBool ParseImageAttribute(nsIAtom* aAttribute,
                                     const nsString& aString,
                                     nsHTMLValue& aResult);
diff --git a/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp b/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp
index 5fcf6d15b1a..725593c08f4 100644
--- a/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp
@@ -373,7 +373,7 @@ nsHTMLTableCellElement::StringToAttribute(nsIAtom* aAttribute,
   
   /* other attributes */
   else if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseTableHAlignValue(aValue, aResult)) {
+    if (mInner.ParseTableCellHAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -407,7 +407,7 @@ nsHTMLTableCellElement::AttributeToString(nsIAtom* aAttribute,
      choff, colspan, rowspan, height, width, nowrap, background, bgcolor
    */
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
+    if (mInner.TableCellHAlignValueToString(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/mozilla/content/html/content/src/nsHTMLTableColElement.cpp b/mozilla/content/html/content/src/nsHTMLTableColElement.cpp
index 0ad4d456075..a0d4ad97121 100644
--- a/mozilla/content/html/content/src/nsHTMLTableColElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLTableColElement.cpp
@@ -181,7 +181,7 @@ nsHTMLTableColElement::StringToAttribute(nsIAtom* aAttribute,
 
   /* other attributes */
   else if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseTableHAlignValue(aValue, aResult)) {
+    if (mInner.ParseTableCellHAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -205,7 +205,7 @@ nsHTMLTableColElement::AttributeToString(nsIAtom* aAttribute,
      choff, span
    */
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
+    if (mInner.TableCellHAlignValueToString(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/mozilla/content/html/content/src/nsHTMLTableColGroupElement.cpp b/mozilla/content/html/content/src/nsHTMLTableColGroupElement.cpp
index b91aa125b20..1c1eeaa9a19 100644
--- a/mozilla/content/html/content/src/nsHTMLTableColGroupElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLTableColGroupElement.cpp
@@ -170,7 +170,7 @@ nsHTMLTableColGroupElement::StringToAttribute(nsIAtom* aAttribute,
 
   /* other attributes */
   else if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseTableHAlignValue(aValue, aResult)) {
+    if (mInner.ParseTableCellHAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -194,7 +194,7 @@ nsHTMLTableColGroupElement::AttributeToString(nsIAtom* aAttribute,
      choff, repeat
    */
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
+    if (mInner.TableCellHAlignValueToString(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/mozilla/content/html/content/src/nsHTMLTableElement.cpp b/mozilla/content/html/content/src/nsHTMLTableElement.cpp
index 998e76d5374..76acd0e6645 100644
--- a/mozilla/content/html/content/src/nsHTMLTableElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLTableElement.cpp
@@ -877,7 +877,7 @@ nsHTMLTableElement::StringToAttribute(nsIAtom* aAttribute,
 
   /* other attributes */
   else if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseTableHAlignValue(aValue, aResult)) {
+    if (mInner.ParseTableHAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -920,7 +920,7 @@ nsHTMLTableElement::AttributeToString(nsIAtom* aAttribute,
      border, cellpadding, cellspacing, cols, height, width, background, bgcolor
    */
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
+    if (mInner.TableHAlignValueToString(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp b/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp
index d7eb4028482..bfc1a3a8108 100644
--- a/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp
@@ -598,7 +598,7 @@ nsHTMLTableRowElement::StringToAttribute(nsIAtom* aAttribute,
 
   /* other attributes */
   else if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseTableHAlignValue(aValue, aResult)) {
+    if (mInner.ParseTableCellHAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -627,7 +627,7 @@ nsHTMLTableRowElement::AttributeToString(nsIAtom* aAttribute,
      choff, height, width, background, bgcolor
    */
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
+    if (mInner.TableCellHAlignValueToString(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/mozilla/content/html/content/src/nsHTMLTableSectionElement.cpp b/mozilla/content/html/content/src/nsHTMLTableSectionElement.cpp
index 437f65aaec9..8eeb17117b5 100644
--- a/mozilla/content/html/content/src/nsHTMLTableSectionElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLTableSectionElement.cpp
@@ -239,7 +239,7 @@ nsHTMLTableSectionElement::StringToAttribute(nsIAtom* aAttribute,
 
   /* other attributes */
   else if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseTableHAlignValue(aValue, aResult)) {
+    if (mInner.ParseTableCellHAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -269,7 +269,7 @@ nsHTMLTableSectionElement::AttributeToString(nsIAtom* aAttribute,
      choff, height, width, background, bgcolor
    */
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
+    if (mInner.TableCellHAlignValueToString(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp
index 82b04779604..d84a977b153 100644
--- a/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp
+++ b/mozilla/layout/html/content/src/nsGenericHTMLElement.cpp
@@ -1690,20 +1690,6 @@ static nsGenericHTMLElement::EnumTable kScrollingStandardTable[] = {
   { 0 }
 };
 
-static nsGenericHTMLElement::EnumTable kTableHAlignTable[] = {
-  { "left",   NS_STYLE_TEXT_ALIGN_LEFT },
-  { "right",  NS_STYLE_TEXT_ALIGN_RIGHT },
-  { "center", NS_STYLE_TEXT_ALIGN_CENTER },
-  { "char",   NS_STYLE_TEXT_ALIGN_CHAR },
-  { "justify",NS_STYLE_TEXT_ALIGN_JUSTIFY },
-
-  // The following are non-standard but necessary for Nav4 compatibility
-  { "middle", NS_STYLE_TEXT_ALIGN_CENTER },
-  { "absmiddle", NS_STYLE_TEXT_ALIGN_CENTER },
-
-  { 0 }
-};
-
 static nsGenericHTMLElement::EnumTable kTableVAlignTable[] = {
   { "top",     NS_STYLE_VERTICAL_ALIGN_TOP },
   { "middle",  NS_STYLE_VERTICAL_ALIGN_MIDDLE },
@@ -1730,13 +1716,91 @@ nsGenericHTMLElement::ParseAlignValue(const nsString& aString,
   return ParseEnumValue(aString, kAlignTable, aResult);
 }
 
+//----------------------------------------
+
+// Vanilla table as defined by the html4 spec...
+static nsGenericHTMLElement::EnumTable kTableHAlignTable[] = {
+  { "left",   NS_STYLE_TEXT_ALIGN_LEFT },
+  { "right",  NS_STYLE_TEXT_ALIGN_RIGHT },
+  { "center", NS_STYLE_TEXT_ALIGN_CENTER },
+  { "char",   NS_STYLE_TEXT_ALIGN_CHAR },
+  { "justify",NS_STYLE_TEXT_ALIGN_JUSTIFY },
+  { 0 }
+};
+
+// This table is used for TABLE when in compatability mode
+static nsGenericHTMLElement::EnumTable kCompatTableHAlignTable[] = {
+  { "left",   NS_STYLE_TEXT_ALIGN_LEFT },
+  { "right",  NS_STYLE_TEXT_ALIGN_RIGHT },
+  { "center", NS_STYLE_TEXT_ALIGN_CENTER },
+  { "char",   NS_STYLE_TEXT_ALIGN_CHAR },
+  { "justify",NS_STYLE_TEXT_ALIGN_JUSTIFY },
+  { "abscenter", NS_STYLE_TEXT_ALIGN_CENTER },
+  { 0 }
+};
+
 PRBool
 nsGenericHTMLElement::ParseTableHAlignValue(const nsString& aString,
-                                            nsHTMLValue& aResult)
+                                            nsHTMLValue& aResult) const
 {
+  if (InNavQuirksMode()) {
+    return ParseEnumValue(aString, kCompatTableHAlignTable, aResult);
+  }
   return ParseEnumValue(aString, kTableHAlignTable, aResult);
 }
 
+PRBool
+nsGenericHTMLElement::TableHAlignValueToString(const nsHTMLValue& aValue,
+                                               nsString& aResult) const
+{
+  if (InNavQuirksMode()) {
+    return EnumValueToString(aValue, kCompatTableHAlignTable, aResult);
+  }
+  return EnumValueToString(aValue, kTableHAlignTable, aResult);
+}
+
+//----------------------------------------
+
+// This table is used for TD,TH,TR, etc (but not TABLE) when in
+// compatability mode
+static nsGenericHTMLElement::EnumTable kCompatTableCellHAlignTable[] = {
+  { "left",   NS_STYLE_TEXT_ALIGN_LEFT },
+  // Note: use compatible version of alignment constants so that
+  // nested tables will be right aligned or center aligned.
+  { "right",  NS_STYLE_TEXT_ALIGN_MOZ_RIGHT },
+  { "center", NS_STYLE_TEXT_ALIGN_MOZ_CENTER },
+  { "char",   NS_STYLE_TEXT_ALIGN_CHAR },
+  { "justify",NS_STYLE_TEXT_ALIGN_JUSTIFY },
+
+  // The following are non-standard but necessary for Nav4 compatibility
+  { "middle", NS_STYLE_TEXT_ALIGN_CENTER },
+  { "absmiddle", NS_STYLE_TEXT_ALIGN_CENTER },// XXX is this right???
+
+  { 0 }
+};
+
+PRBool
+nsGenericHTMLElement::ParseTableCellHAlignValue(const nsString& aString,
+                                                nsHTMLValue& aResult) const
+{
+  if (InNavQuirksMode()) {
+    return ParseEnumValue(aString, kCompatTableCellHAlignTable, aResult);
+  }
+  return ParseEnumValue(aString, kTableHAlignTable, aResult);
+}
+
+PRBool
+nsGenericHTMLElement::TableCellHAlignValueToString(const nsHTMLValue& aValue,
+                                                   nsString& aResult) const
+{
+  if (InNavQuirksMode()) {
+    return EnumValueToString(aValue, kCompatTableCellHAlignTable, aResult);
+  }
+  return EnumValueToString(aValue, kTableHAlignTable, aResult);
+}
+
+//----------------------------------------
+
 PRBool
 nsGenericHTMLElement::ParseTableVAlignValue(const nsString& aString,
                                             nsHTMLValue& aResult)
@@ -1751,13 +1815,6 @@ nsGenericHTMLElement::AlignValueToString(const nsHTMLValue& aValue,
   return EnumValueToString(aValue, kAlignTable, aResult);
 }
 
-PRBool
-nsGenericHTMLElement::TableHAlignValueToString(const nsHTMLValue& aValue,
-                                               nsString& aResult)
-{
-  return EnumValueToString(aValue, kTableHAlignTable, aResult);
-}
-
 PRBool
 nsGenericHTMLElement::TableVAlignValueToString(const nsHTMLValue& aValue,
                                                nsString& aResult)
diff --git a/mozilla/layout/html/content/src/nsGenericHTMLElement.h b/mozilla/layout/html/content/src/nsGenericHTMLElement.h
index ab0fb6d615a..41869746a51 100644
--- a/mozilla/layout/html/content/src/nsGenericHTMLElement.h
+++ b/mozilla/layout/html/content/src/nsGenericHTMLElement.h
@@ -189,25 +189,28 @@ public:
 
   PRBool ParseDivAlignValue(const nsString& aString,
                             nsHTMLValue& aResult) const;
+  PRBool DivAlignValueToString(const nsHTMLValue& aValue,
+                               nsString& aResult) const;
 
-  static PRBool ParseTableHAlignValue(const nsString& aString,
-                                      nsHTMLValue& aResult);
+  PRBool ParseTableHAlignValue(const nsString& aString,
+                               nsHTMLValue& aResult) const;
+  PRBool TableHAlignValueToString(const nsHTMLValue& aValue,
+                                  nsString& aResult) const;
+
+  PRBool ParseTableCellHAlignValue(const nsString& aString,
+                                   nsHTMLValue& aResult) const;
+  PRBool TableCellHAlignValueToString(const nsHTMLValue& aValue,
+                                      nsString& aResult) const;
 
   static PRBool ParseTableVAlignValue(const nsString& aString,
                                       nsHTMLValue& aResult);
 
-  static PRBool TableHAlignValueToString(const nsHTMLValue& aValue,
-                                         nsString& aResult);
-
   static PRBool TableVAlignValueToString(const nsHTMLValue& aValue,
                                          nsString& aResult);
 
   static PRBool AlignValueToString(const nsHTMLValue& aValue,
                                    nsString& aResult);
 
-  PRBool DivAlignValueToString(const nsHTMLValue& aValue,
-                               nsString& aResult) const;
-
   static PRBool ParseImageAttribute(nsIAtom* aAttribute,
                                     const nsString& aString,
                                     nsHTMLValue& aResult);
diff --git a/mozilla/layout/html/content/src/nsHTMLTableCellElement.cpp b/mozilla/layout/html/content/src/nsHTMLTableCellElement.cpp
index 5fcf6d15b1a..725593c08f4 100644
--- a/mozilla/layout/html/content/src/nsHTMLTableCellElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLTableCellElement.cpp
@@ -373,7 +373,7 @@ nsHTMLTableCellElement::StringToAttribute(nsIAtom* aAttribute,
   
   /* other attributes */
   else if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseTableHAlignValue(aValue, aResult)) {
+    if (mInner.ParseTableCellHAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -407,7 +407,7 @@ nsHTMLTableCellElement::AttributeToString(nsIAtom* aAttribute,
      choff, colspan, rowspan, height, width, nowrap, background, bgcolor
    */
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
+    if (mInner.TableCellHAlignValueToString(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/mozilla/layout/html/content/src/nsHTMLTableColElement.cpp b/mozilla/layout/html/content/src/nsHTMLTableColElement.cpp
index 0ad4d456075..a0d4ad97121 100644
--- a/mozilla/layout/html/content/src/nsHTMLTableColElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLTableColElement.cpp
@@ -181,7 +181,7 @@ nsHTMLTableColElement::StringToAttribute(nsIAtom* aAttribute,
 
   /* other attributes */
   else if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseTableHAlignValue(aValue, aResult)) {
+    if (mInner.ParseTableCellHAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -205,7 +205,7 @@ nsHTMLTableColElement::AttributeToString(nsIAtom* aAttribute,
      choff, span
    */
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
+    if (mInner.TableCellHAlignValueToString(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/mozilla/layout/html/content/src/nsHTMLTableColGroupElement.cpp b/mozilla/layout/html/content/src/nsHTMLTableColGroupElement.cpp
index b91aa125b20..1c1eeaa9a19 100644
--- a/mozilla/layout/html/content/src/nsHTMLTableColGroupElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLTableColGroupElement.cpp
@@ -170,7 +170,7 @@ nsHTMLTableColGroupElement::StringToAttribute(nsIAtom* aAttribute,
 
   /* other attributes */
   else if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseTableHAlignValue(aValue, aResult)) {
+    if (mInner.ParseTableCellHAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -194,7 +194,7 @@ nsHTMLTableColGroupElement::AttributeToString(nsIAtom* aAttribute,
      choff, repeat
    */
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
+    if (mInner.TableCellHAlignValueToString(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/mozilla/layout/html/content/src/nsHTMLTableElement.cpp b/mozilla/layout/html/content/src/nsHTMLTableElement.cpp
index 998e76d5374..76acd0e6645 100644
--- a/mozilla/layout/html/content/src/nsHTMLTableElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLTableElement.cpp
@@ -877,7 +877,7 @@ nsHTMLTableElement::StringToAttribute(nsIAtom* aAttribute,
 
   /* other attributes */
   else if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseTableHAlignValue(aValue, aResult)) {
+    if (mInner.ParseTableHAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -920,7 +920,7 @@ nsHTMLTableElement::AttributeToString(nsIAtom* aAttribute,
      border, cellpadding, cellspacing, cols, height, width, background, bgcolor
    */
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
+    if (mInner.TableHAlignValueToString(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/mozilla/layout/html/content/src/nsHTMLTableRowElement.cpp b/mozilla/layout/html/content/src/nsHTMLTableRowElement.cpp
index d7eb4028482..bfc1a3a8108 100644
--- a/mozilla/layout/html/content/src/nsHTMLTableRowElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLTableRowElement.cpp
@@ -598,7 +598,7 @@ nsHTMLTableRowElement::StringToAttribute(nsIAtom* aAttribute,
 
   /* other attributes */
   else if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseTableHAlignValue(aValue, aResult)) {
+    if (mInner.ParseTableCellHAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -627,7 +627,7 @@ nsHTMLTableRowElement::AttributeToString(nsIAtom* aAttribute,
      choff, height, width, background, bgcolor
    */
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
+    if (mInner.TableCellHAlignValueToString(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
diff --git a/mozilla/layout/html/content/src/nsHTMLTableSectionElement.cpp b/mozilla/layout/html/content/src/nsHTMLTableSectionElement.cpp
index 437f65aaec9..8eeb17117b5 100644
--- a/mozilla/layout/html/content/src/nsHTMLTableSectionElement.cpp
+++ b/mozilla/layout/html/content/src/nsHTMLTableSectionElement.cpp
@@ -239,7 +239,7 @@ nsHTMLTableSectionElement::StringToAttribute(nsIAtom* aAttribute,
 
   /* other attributes */
   else if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::ParseTableHAlignValue(aValue, aResult)) {
+    if (mInner.ParseTableCellHAlignValue(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }
@@ -269,7 +269,7 @@ nsHTMLTableSectionElement::AttributeToString(nsIAtom* aAttribute,
      choff, height, width, background, bgcolor
    */
   if (aAttribute == nsHTMLAtoms::align) {
-    if (nsGenericHTMLElement::TableHAlignValueToString(aValue, aResult)) {
+    if (mInner.TableCellHAlignValueToString(aValue, aResult)) {
       return NS_CONTENT_ATTR_HAS_VALUE;
     }
   }