From 694a01717f7aba324d0ea32b66d7f1e4da92db05 Mon Sep 17 00:00:00 2001 From: Karl Tomlinson Date: Wed, 21 Apr 2010 17:21:36 +1200 Subject: [PATCH] backout e1e1143be432 due to reftest failure in layout/reftests/bugs/393760-1.xml b=552044 --- .../mathml/content/src/nsMathMLElement.cpp | 49 ++----------------- .../reftests/mathml/mathbackground-1-ref.mml | 7 --- layout/reftests/mathml/mathbackground-1.mml | 7 --- .../reftests/mathml/mathbackground-2-ref.mml | 7 --- layout/reftests/mathml/mathbackground-2.mml | 7 --- .../reftests/mathml/mathbackground-3-ref.mml | 5 -- layout/reftests/mathml/mathbackground-3.mml | 5 -- .../reftests/mathml/mathbackground-4-ref.mml | 7 --- layout/reftests/mathml/mathbackground-4.mml | 7 --- layout/reftests/mathml/mathcolor-1-ref.mml | 7 --- layout/reftests/mathml/mathcolor-1.mml | 7 --- layout/reftests/mathml/mathcolor-2-ref.mml | 7 --- layout/reftests/mathml/mathcolor-2.mml | 7 --- layout/reftests/mathml/mathcolor-3-ref.mml | 5 -- layout/reftests/mathml/mathcolor-3.mml | 5 -- layout/reftests/mathml/mathcolor-4-ref.mml | 7 --- layout/reftests/mathml/mathcolor-4.mml | 7 --- layout/reftests/mathml/reftest.list | 8 --- 18 files changed, 5 insertions(+), 156 deletions(-) delete mode 100644 layout/reftests/mathml/mathbackground-1-ref.mml delete mode 100644 layout/reftests/mathml/mathbackground-1.mml delete mode 100644 layout/reftests/mathml/mathbackground-2-ref.mml delete mode 100644 layout/reftests/mathml/mathbackground-2.mml delete mode 100644 layout/reftests/mathml/mathbackground-3-ref.mml delete mode 100644 layout/reftests/mathml/mathbackground-3.mml delete mode 100644 layout/reftests/mathml/mathbackground-4-ref.mml delete mode 100644 layout/reftests/mathml/mathbackground-4.mml delete mode 100644 layout/reftests/mathml/mathcolor-1-ref.mml delete mode 100644 layout/reftests/mathml/mathcolor-1.mml delete mode 100644 layout/reftests/mathml/mathcolor-2-ref.mml delete mode 100644 layout/reftests/mathml/mathcolor-2.mml delete mode 100644 layout/reftests/mathml/mathcolor-3-ref.mml delete mode 100644 layout/reftests/mathml/mathcolor-3.mml delete mode 100644 layout/reftests/mathml/mathcolor-4-ref.mml delete mode 100644 layout/reftests/mathml/mathcolor-4.mml diff --git a/content/mathml/content/src/nsMathMLElement.cpp b/content/mathml/content/src/nsMathMLElement.cpp index fc3ae7dec07..35d0ae4ec5c 100644 --- a/content/mathml/content/src/nsMathMLElement.cpp +++ b/content/mathml/content/src/nsMathMLElement.cpp @@ -22,7 +22,6 @@ * Contributor(s): * Vlad Sukhoy (original developer) * Daniel Kraft (nsMathMLElement patch, attachment 262925) - * Frederic Wang * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -123,7 +122,9 @@ nsMathMLElement::ParseAttribute(PRInt32 aNamespaceID, static nsGenericElement::MappedAttributeEntry sTokenStyles[] = { { &nsGkAtoms::mathsize_ }, { &nsGkAtoms::fontsize_ }, + { &nsGkAtoms::mathcolor_ }, { &nsGkAtoms::color }, + { &nsGkAtoms::mathbackground_ }, { &nsGkAtoms::fontfamily_ }, { nsnull } }; @@ -136,67 +137,27 @@ static nsGenericElement::MappedAttributeEntry sEnvironmentStyles[] = { { nsnull } }; -static nsGenericElement::MappedAttributeEntry sCommonPresStyles[] = { - { &nsGkAtoms::mathcolor_ }, - { &nsGkAtoms::mathbackground_ }, - { nsnull } -}; - PRBool nsMathMLElement::IsAttributeMapped(const nsIAtom* aAttribute) const { static const MappedAttributeEntry* const tokenMap[] = { - sTokenStyles, - sCommonPresStyles + sTokenStyles }; static const MappedAttributeEntry* const mstyleMap[] = { sTokenStyles, - sEnvironmentStyles, - sCommonPresStyles - }; - static const MappedAttributeEntry* const commonPresMap[] = { - sCommonPresStyles + sEnvironmentStyles }; // We don't support mglyph (yet). nsIAtom* tag = Tag(); if (tag == nsGkAtoms::ms_ || tag == nsGkAtoms::mi_ || tag == nsGkAtoms::mn_ || tag == nsGkAtoms::mo_ || - tag == nsGkAtoms::mtext_ || tag == nsGkAtoms::mspace_) + tag == nsGkAtoms::mtext_) return FindAttributeDependence(aAttribute, tokenMap, NS_ARRAY_LENGTH(tokenMap)); if (tag == nsGkAtoms::mstyle_) return FindAttributeDependence(aAttribute, mstyleMap, NS_ARRAY_LENGTH(mstyleMap)); - - if (tag == nsGkAtoms::maction_ || - tag == nsGkAtoms::maligngroup_ || - tag == nsGkAtoms::malignmark_ || - tag == nsGkAtoms::math || - tag == nsGkAtoms::menclose_ || - tag == nsGkAtoms::merror_ || - tag == nsGkAtoms::mfenced_ || - tag == nsGkAtoms::mfrac_ || - tag == nsGkAtoms::mover_ || - tag == nsGkAtoms::mpadded_ || - tag == nsGkAtoms::mphantom_ || - tag == nsGkAtoms::mprescripts_ || - tag == nsGkAtoms::mroot_ || - tag == nsGkAtoms::mrow_ || - tag == nsGkAtoms::msqrt_ || - tag == nsGkAtoms::msub_ || - tag == nsGkAtoms::msubsup_ || - tag == nsGkAtoms::msup_ || - tag == nsGkAtoms::mtable_ || - tag == nsGkAtoms::mtd_ || - tag == nsGkAtoms::mtr_ || - tag == nsGkAtoms::munder_ || - tag == nsGkAtoms::munderover_ || - tag == nsGkAtoms::none) { - return FindAttributeDependence(aAttribute, commonPresMap, - NS_ARRAY_LENGTH(commonPresMap)); - } - return PR_FALSE; } diff --git a/layout/reftests/mathml/mathbackground-1-ref.mml b/layout/reftests/mathml/mathbackground-1-ref.mml deleted file mode 100644 index a56bab47f1c..00000000000 --- a/layout/reftests/mathml/mathbackground-1-ref.mml +++ /dev/null @@ -1,7 +0,0 @@ - - - - □■□■□■□ - - - diff --git a/layout/reftests/mathml/mathbackground-1.mml b/layout/reftests/mathml/mathbackground-1.mml deleted file mode 100644 index f6439a0403c..00000000000 --- a/layout/reftests/mathml/mathbackground-1.mml +++ /dev/null @@ -1,7 +0,0 @@ - - - - □■□■□■□ - - - diff --git a/layout/reftests/mathml/mathbackground-2-ref.mml b/layout/reftests/mathml/mathbackground-2-ref.mml deleted file mode 100644 index 7dd51a7c1a9..00000000000 --- a/layout/reftests/mathml/mathbackground-2-ref.mml +++ /dev/null @@ -1,7 +0,0 @@ - - - - □■□■□■□ - - - diff --git a/layout/reftests/mathml/mathbackground-2.mml b/layout/reftests/mathml/mathbackground-2.mml deleted file mode 100644 index ce779a27fe6..00000000000 --- a/layout/reftests/mathml/mathbackground-2.mml +++ /dev/null @@ -1,7 +0,0 @@ - - - - □■□■□■□ - - - diff --git a/layout/reftests/mathml/mathbackground-3-ref.mml b/layout/reftests/mathml/mathbackground-3-ref.mml deleted file mode 100644 index ac09a5353bb..00000000000 --- a/layout/reftests/mathml/mathbackground-3-ref.mml +++ /dev/null @@ -1,5 +0,0 @@ - - - □■□■□■□ - - diff --git a/layout/reftests/mathml/mathbackground-3.mml b/layout/reftests/mathml/mathbackground-3.mml deleted file mode 100644 index 4c96d92f72b..00000000000 --- a/layout/reftests/mathml/mathbackground-3.mml +++ /dev/null @@ -1,5 +0,0 @@ - - - □■□■□■□ - - diff --git a/layout/reftests/mathml/mathbackground-4-ref.mml b/layout/reftests/mathml/mathbackground-4-ref.mml deleted file mode 100644 index cdfa983a7d3..00000000000 --- a/layout/reftests/mathml/mathbackground-4-ref.mml +++ /dev/null @@ -1,7 +0,0 @@ - - - - □■□■□■□ - - - diff --git a/layout/reftests/mathml/mathbackground-4.mml b/layout/reftests/mathml/mathbackground-4.mml deleted file mode 100644 index 3021886c25e..00000000000 --- a/layout/reftests/mathml/mathbackground-4.mml +++ /dev/null @@ -1,7 +0,0 @@ - - - - □■□■□■□ - - - diff --git a/layout/reftests/mathml/mathcolor-1-ref.mml b/layout/reftests/mathml/mathcolor-1-ref.mml deleted file mode 100644 index 370e93c7f37..00000000000 --- a/layout/reftests/mathml/mathcolor-1-ref.mml +++ /dev/null @@ -1,7 +0,0 @@ - - - - □■□■□■□ - - - diff --git a/layout/reftests/mathml/mathcolor-1.mml b/layout/reftests/mathml/mathcolor-1.mml deleted file mode 100644 index c99ae19db7f..00000000000 --- a/layout/reftests/mathml/mathcolor-1.mml +++ /dev/null @@ -1,7 +0,0 @@ - - - - □■□■□■□ - - - diff --git a/layout/reftests/mathml/mathcolor-2-ref.mml b/layout/reftests/mathml/mathcolor-2-ref.mml deleted file mode 100644 index 28e12c5bc30..00000000000 --- a/layout/reftests/mathml/mathcolor-2-ref.mml +++ /dev/null @@ -1,7 +0,0 @@ - - - - □■□■□■□ - - - diff --git a/layout/reftests/mathml/mathcolor-2.mml b/layout/reftests/mathml/mathcolor-2.mml deleted file mode 100644 index d384a2dcde6..00000000000 --- a/layout/reftests/mathml/mathcolor-2.mml +++ /dev/null @@ -1,7 +0,0 @@ - - - - □■□■□■□ - - - diff --git a/layout/reftests/mathml/mathcolor-3-ref.mml b/layout/reftests/mathml/mathcolor-3-ref.mml deleted file mode 100644 index e1cd1397e97..00000000000 --- a/layout/reftests/mathml/mathcolor-3-ref.mml +++ /dev/null @@ -1,5 +0,0 @@ - - - □■□■□■□ - - diff --git a/layout/reftests/mathml/mathcolor-3.mml b/layout/reftests/mathml/mathcolor-3.mml deleted file mode 100644 index 223d4f55f5c..00000000000 --- a/layout/reftests/mathml/mathcolor-3.mml +++ /dev/null @@ -1,5 +0,0 @@ - - - □■□■□■□ - - diff --git a/layout/reftests/mathml/mathcolor-4-ref.mml b/layout/reftests/mathml/mathcolor-4-ref.mml deleted file mode 100644 index ec1c0869617..00000000000 --- a/layout/reftests/mathml/mathcolor-4-ref.mml +++ /dev/null @@ -1,7 +0,0 @@ - - - - □■□■□■□ - - - diff --git a/layout/reftests/mathml/mathcolor-4.mml b/layout/reftests/mathml/mathcolor-4.mml deleted file mode 100644 index 7f98c829e0b..00000000000 --- a/layout/reftests/mathml/mathcolor-4.mml +++ /dev/null @@ -1,7 +0,0 @@ - - - - □■□■□■□ - - - diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list index 9c4848040ee..2f1f8602045 100644 --- a/layout/reftests/mathml/reftest.list +++ b/layout/reftests/mathml/reftest.list @@ -9,11 +9,3 @@ == table-width-1.xhtml table-width-1-ref.xhtml == underbar-width-1.xhtml underbar-width-1-ref.xhtml == mathml-type-supported.xhtml mathml-type-supported-ref.xml -!= mathcolor-1.mml mathcolor-1-ref.mml -!= mathcolor-2.mml mathcolor-2-ref.mml -!= mathcolor-3.mml mathcolor-3-ref.mml -== mathcolor-4.mml mathcolor-4-ref.mml -!= mathbackground-1.mml mathbackground-1-ref.mml -!= mathbackground-2.mml mathbackground-2-ref.mml -!= mathbackground-3.mml mathbackground-3-ref.mml -== mathbackground-4.mml mathbackground-4-ref.mml