diff --git a/layout/base/nsStyleConsts.h b/layout/base/nsStyleConsts.h
index 2734d0a00b0a..e24251e8bc19 100644
--- a/layout/base/nsStyleConsts.h
+++ b/layout/base/nsStyleConsts.h
@@ -585,15 +585,18 @@
//
// Note: make sure the numbers are less than the numbers that start
// the vertical_align values below!
-#define NS_STYLE_TEXT_ALIGN_DEFAULT 0
-#define NS_STYLE_TEXT_ALIGN_LEFT 1
-#define NS_STYLE_TEXT_ALIGN_RIGHT 2
-#define NS_STYLE_TEXT_ALIGN_CENTER 3
-#define NS_STYLE_TEXT_ALIGN_JUSTIFY 4
-#define NS_STYLE_TEXT_ALIGN_CHAR 5 //align based on a certain character, for table cell
-#define NS_STYLE_TEXT_ALIGN_MOZ_CENTER 6
-#define NS_STYLE_TEXT_ALIGN_MOZ_RIGHT 7
-#define NS_STYLE_TEXT_ALIGN_MOZ_LEFT 8
+#define NS_STYLE_TEXT_ALIGN_DEFAULT 0
+#define NS_STYLE_TEXT_ALIGN_LEFT 1
+#define NS_STYLE_TEXT_ALIGN_RIGHT 2
+#define NS_STYLE_TEXT_ALIGN_CENTER 3
+#define NS_STYLE_TEXT_ALIGN_JUSTIFY 4
+#define NS_STYLE_TEXT_ALIGN_CHAR 5 //align based on a certain character, for table cell
+#define NS_STYLE_TEXT_ALIGN_MOZ_CENTER 6
+#define NS_STYLE_TEXT_ALIGN_MOZ_RIGHT 7
+#define NS_STYLE_TEXT_ALIGN_MOZ_LEFT 8
+// NS_STYLE_TEXT_ALIGN_MOZ_CENTER_OR_INHERIT is only used in data structs; it
+// is never present in stylesheets or computed data.
+#define NS_STYLE_TEXT_ALIGN_MOZ_CENTER_OR_INHERIT 9
// See nsStyleText, nsStyleFont
#define NS_STYLE_TEXT_DECORATION_NONE 0
diff --git a/layout/reftests/bugs/475986-1-ref.html b/layout/reftests/bugs/475986-1-ref.html
new file mode 100644
index 000000000000..f733250e10bc
--- /dev/null
+++ b/layout/reftests/bugs/475986-1-ref.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-1a.html b/layout/reftests/bugs/475986-1a.html
new file mode 100644
index 000000000000..9581eadb3bf9
--- /dev/null
+++ b/layout/reftests/bugs/475986-1a.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-1b.html b/layout/reftests/bugs/475986-1b.html
new file mode 100644
index 000000000000..b0ca4a8cca4d
--- /dev/null
+++ b/layout/reftests/bugs/475986-1b.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-1c.html b/layout/reftests/bugs/475986-1c.html
new file mode 100644
index 000000000000..5e306fc1eb31
--- /dev/null
+++ b/layout/reftests/bugs/475986-1c.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-1d.html b/layout/reftests/bugs/475986-1d.html
new file mode 100644
index 000000000000..ea7a25d1df3f
--- /dev/null
+++ b/layout/reftests/bugs/475986-1d.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-1e.html b/layout/reftests/bugs/475986-1e.html
new file mode 100644
index 000000000000..b20f4613c958
--- /dev/null
+++ b/layout/reftests/bugs/475986-1e.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-1f.html b/layout/reftests/bugs/475986-1f.html
new file mode 100644
index 000000000000..c954982bb162
--- /dev/null
+++ b/layout/reftests/bugs/475986-1f.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-2-ref.html b/layout/reftests/bugs/475986-2-ref.html
new file mode 100644
index 000000000000..bc1588459d5d
--- /dev/null
+++ b/layout/reftests/bugs/475986-2-ref.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-2a.html b/layout/reftests/bugs/475986-2a.html
new file mode 100644
index 000000000000..fb7157bfa5fa
--- /dev/null
+++ b/layout/reftests/bugs/475986-2a.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-2b.html b/layout/reftests/bugs/475986-2b.html
new file mode 100644
index 000000000000..f8d88fddbb38
--- /dev/null
+++ b/layout/reftests/bugs/475986-2b.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-2c.html b/layout/reftests/bugs/475986-2c.html
new file mode 100644
index 000000000000..70853875d99b
--- /dev/null
+++ b/layout/reftests/bugs/475986-2c.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-2d.html b/layout/reftests/bugs/475986-2d.html
new file mode 100644
index 000000000000..bba2a150482c
--- /dev/null
+++ b/layout/reftests/bugs/475986-2d.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-2e.html b/layout/reftests/bugs/475986-2e.html
new file mode 100644
index 000000000000..e1c35e1615ad
--- /dev/null
+++ b/layout/reftests/bugs/475986-2e.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-2f.html b/layout/reftests/bugs/475986-2f.html
new file mode 100644
index 000000000000..144522f3eb6d
--- /dev/null
+++ b/layout/reftests/bugs/475986-2f.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-3-ref.html b/layout/reftests/bugs/475986-3-ref.html
new file mode 100644
index 000000000000..f72dd9bc7a11
--- /dev/null
+++ b/layout/reftests/bugs/475986-3-ref.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-3a.html b/layout/reftests/bugs/475986-3a.html
new file mode 100644
index 000000000000..ce22721cd44b
--- /dev/null
+++ b/layout/reftests/bugs/475986-3a.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-3b.html b/layout/reftests/bugs/475986-3b.html
new file mode 100644
index 000000000000..aae610ecc8c1
--- /dev/null
+++ b/layout/reftests/bugs/475986-3b.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-4-ref.html b/layout/reftests/bugs/475986-4-ref.html
new file mode 100644
index 000000000000..95da846adf8b
--- /dev/null
+++ b/layout/reftests/bugs/475986-4-ref.html
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/475986-4.html b/layout/reftests/bugs/475986-4.html
new file mode 100644
index 000000000000..be7237704d6e
--- /dev/null
+++ b/layout/reftests/bugs/475986-4.html
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list
index 15cccd109a7d..696d926c0169 100644
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1040,6 +1040,24 @@ fails == 461512-1.html 461512-1-ref.html # Bug 461512
== 474336-1.xul 474336-1-ref.xul
== 474417-1.html 474417-1-ref.html
== 474472-1.html 474472-1-ref.html
+== 475986-1a.html 475986-1-ref.html
+== 475986-1b.html 475986-1-ref.html
+== 475986-1c.html 475986-1-ref.html
+== 475986-1d.html 475986-1-ref.html
+== 475986-1e.html 475986-1-ref.html
+== 475986-1f.html 475986-1-ref.html
+== 475986-2a.html 475986-2-ref.html
+== 475986-2b.html 475986-2-ref.html
+== 475986-2c.html 475986-2-ref.html
+== 475986-2d.html 475986-2-ref.html
+== 475986-2e.html 475986-2-ref.html
+== 475986-2f.html 475986-2-ref.html
+== 475986-3a.html 475986-3-ref.html
+== 475986-3b.html 475986-3-ref.html
+== 475986-4.html 475986-4-ref.html
+!= 475986-1-ref.html 475986-2-ref.html
+!= 475986-1-ref.html 475986-3-ref.html
+!= 475986-2-ref.html 475986-3-ref.html
== 476063-1.html 476063-1-ref.html
== 476063-2.html 476063-2-ref.html
!= 476063-3.html 476063-3-ref.html
diff --git a/layout/style/nsHTMLStyleSheet.cpp b/layout/style/nsHTMLStyleSheet.cpp
index ad1303809f77..7ecbf9289a11 100644
--- a/layout/style/nsHTMLStyleSheet.cpp
+++ b/layout/style/nsHTMLStyleSheet.cpp
@@ -109,27 +109,15 @@ nsHTMLStyleSheet::GenericTableRule::List(FILE* out, PRInt32 aIndent) const
}
#endif
-static void PostResolveCallback(void* aStyleStruct, nsRuleData* aRuleData)
-{
- nsStyleText* text = (nsStyleText*)aStyleStruct;
- if (text->mTextAlign == NS_STYLE_TEXT_ALIGN_DEFAULT) {
- nsStyleContext* parentContext = aRuleData->mStyleContext->GetParent();
-
- if (parentContext) {
- const nsStyleText* parentStyleText = parentContext->GetStyleText();
- PRUint8 parentAlign = parentStyleText->mTextAlign;
- text->mTextAlign = (NS_STYLE_TEXT_ALIGN_DEFAULT == parentAlign)
- ? NS_STYLE_TEXT_ALIGN_CENTER : parentAlign;
- }
- }
-}
-
NS_IMETHODIMP
nsHTMLStyleSheet::TableTHRule::MapRuleInfoInto(nsRuleData* aRuleData)
{
if (aRuleData->mSIDs & NS_STYLE_INHERIT_BIT(Text)) {
- aRuleData->mCanStoreInRuleTree = PR_FALSE;
- aRuleData->mPostResolveCallback = &PostResolveCallback;
+ if (aRuleData->mTextData->mTextAlign.GetUnit() == eCSSUnit_Null) {
+ aRuleData->mTextData->mTextAlign.
+ SetIntValue(NS_STYLE_TEXT_ALIGN_MOZ_CENTER_OR_INHERIT,
+ eCSSUnit_Enumerated);
+ }
}
return NS_OK;
}
diff --git a/layout/style/nsRuleNode.cpp b/layout/style/nsRuleNode.cpp
index 64d9ccf41c21..2e3deda9f9e5 100644
--- a/layout/style/nsRuleNode.cpp
+++ b/layout/style/nsRuleNode.cpp
@@ -970,6 +970,26 @@ CheckColorCallback(const nsRuleDataStruct& aData,
return aResult;
}
+static nsRuleNode::RuleDetail
+CheckTextCallback(const nsRuleDataStruct& aData,
+ nsRuleNode::RuleDetail aResult)
+{
+ const nsRuleDataText& textData =
+ static_cast(aData);
+
+ if (textData.mTextAlign.GetUnit() == eCSSUnit_Enumerated &&
+ textData.mTextAlign.GetIntValue() ==
+ NS_STYLE_TEXT_ALIGN_MOZ_CENTER_OR_INHERIT) {
+ // Promote reset to mixed since we have something that depends on
+ // the parent.
+ if (aResult == nsRuleNode::eRulePartialReset)
+ aResult = nsRuleNode::eRulePartialMixed;
+ else if (aResult == nsRuleNode::eRuleFullReset)
+ aResult = nsRuleNode::eRuleFullMixed;
+ }
+
+ return aResult;
+}
// for nsCSSPropList.h, so we get information on things in the style
// structs but not nsCSS*
@@ -3059,6 +3079,13 @@ nsRuleNode::ComputeTextData(void* aStartStruct,
// text-align: enum, string, inherit, initial
if (eCSSUnit_String == textData.mTextAlign.GetUnit()) {
NS_NOTYETIMPLEMENTED("align string");
+ } else if (eCSSUnit_Enumerated == textData.mTextAlign.GetUnit() &&
+ NS_STYLE_TEXT_ALIGN_MOZ_CENTER_OR_INHERIT ==
+ textData.mTextAlign.GetIntValue()) {
+ canStoreInRuleTree = PR_FALSE;
+ PRUint8 parentAlign = parentText->mTextAlign;
+ text->mTextAlign = (NS_STYLE_TEXT_ALIGN_DEFAULT == parentAlign) ?
+ NS_STYLE_TEXT_ALIGN_CENTER : parentAlign;
} else
SetDiscrete(textData.mTextAlign, text->mTextAlign, canStoreInRuleTree,
SETDSC_ENUMERATED, parentText->mTextAlign,
diff --git a/layout/style/nsStyleStructList.h b/layout/style/nsStyleStructList.h
index 0134de0133b1..a995899d45d5 100644
--- a/layout/style/nsStyleStructList.h
+++ b/layout/style/nsStyleStructList.h
@@ -86,7 +86,7 @@ STYLE_STRUCT_INHERITED(List, nsnull, ())
STYLE_STRUCT_TEST_CODE( if (STYLE_STRUCT_TEST == 4) {)
STYLE_STRUCT_RESET(Position, nsnull, ())
STYLE_STRUCT_TEST_CODE( } else {)
-STYLE_STRUCT_INHERITED(Text, nsnull, ())
+STYLE_STRUCT_INHERITED(Text, CheckTextCallback, ())
STYLE_STRUCT_TEST_CODE( })
STYLE_STRUCT_TEST_CODE( } else {)
STYLE_STRUCT_TEST_CODE( if (STYLE_STRUCT_TEST == 6) {)