Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backout e1e1143be432 due to reftest failure in layout/reftests/bugs/393760-1.xml b=552044

Browse Source
This commit is contained in:
Karl Tomlinson 2010-04-21 17:21:36 +12:00
parent 62cb88ed53
commit 4a42ab9e7e
18 changed files with 5 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
content/mathml/content/src/nsMathMLElement.cpp
View File

@ -22,7 +22,6 @@
* Contributor(s):
* Vlad Sukhoy <vladimir.sukhoy@gmail.com> (original developer)
* Daniel Kraft <d@domob.eu> (nsMathMLElement patch, attachment 262925)
* Frederic Wang <fred.wang@free.fr>
*
* 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;
}

7
layout/reftests/mathml/mathbackground-1-ref.mml
View File

@ -1,7 +0,0 @@
<!-- test mathbackground on a presentation element -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mrow mathbackground="green">
<mtext>□■□■□■□</mtext>
</mrow>
</math>

7
layout/reftests/mathml/mathbackground-1.mml
View File

@ -1,7 +0,0 @@
<!-- test mathbackground on a presentation element -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mrow mathbackground="red">
<mtext>□■□■□■□</mtext>
</mrow>
</math>

7
layout/reftests/mathml/mathbackground-2-ref.mml
View File

@ -1,7 +0,0 @@
<!-- test mathbackground on mstyle -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mstyle mathbackground="green">
<mtext>□■□■□■□</mtext>
</mstyle>
</math>

7
layout/reftests/mathml/mathbackground-2.mml
View File

@ -1,7 +0,0 @@
<!-- test mathbackground on mstyle -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mstyle mathbackground="red">
<mtext>□■□■□■□</mtext>
</mstyle>
</math>

5
layout/reftests/mathml/mathbackground-3-ref.mml
View File

@ -1,5 +0,0 @@
<!-- test mathbackground on a token element -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mtext mathbackground="green">□■□■□■□</mtext>
</math>

5
layout/reftests/mathml/mathbackground-3.mml
View File

@ -1,5 +0,0 @@
<!-- test mathbackground on a token element -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mtext mathbackground="red">□■□■□■□</mtext>
</math>

7
layout/reftests/mathml/mathbackground-4-ref.mml
View File

@ -1,7 +0,0 @@
<!-- test mathbackground on a non-presentation element -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<semantics mathbackground="red">
<mtext>□■□■□■□</mtext>
</semantics>
</math>

7
layout/reftests/mathml/mathbackground-4.mml
View File

@ -1,7 +0,0 @@
<!-- test mathbackground on a non-presentation element -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<semantics mathbackground="green">
<mtext>□■□■□■□</mtext>
</semantics>
</math>

7
layout/reftests/mathml/mathcolor-1-ref.mml
View File

@ -1,7 +0,0 @@
<!-- test mathcolor on a presentation element -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mrow mathcolor="green">
<mtext>□■□■□■□</mtext>
</mrow>
</math>

7
layout/reftests/mathml/mathcolor-1.mml
View File

@ -1,7 +0,0 @@
<!-- test mathcolor on a presentation element -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mrow mathcolor="red">
<mtext>□■□■□■□</mtext>
</mrow>
</math>

7
layout/reftests/mathml/mathcolor-2-ref.mml
View File

@ -1,7 +0,0 @@
<!-- test mathcolor on mstyle -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mstyle mathcolor="green">
<mtext>□■□■□■□</mtext>
</mstyle>
</math>

7
layout/reftests/mathml/mathcolor-2.mml
View File

@ -1,7 +0,0 @@
<!-- test mathcolor on mstyle -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mstyle mathcolor="red">
<mtext>□■□■□■□</mtext>
</mstyle>
</math>

5
layout/reftests/mathml/mathcolor-3-ref.mml
View File

@ -1,5 +0,0 @@
<!-- test mathcolor on a token element -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mtext mathcolor="green">□■□■□■□</mtext>
</math>

5
layout/reftests/mathml/mathcolor-3.mml
View File

@ -1,5 +0,0 @@
<!-- test mathcolor on a token element -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<mtext mathcolor="red">□■□■□■□</mtext>
</math>

7
layout/reftests/mathml/mathcolor-4-ref.mml
View File

@ -1,7 +0,0 @@
<!-- test mathcolor on a non-presentation element -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<semantics mathcolor="red">
<mtext>□■□■□■□</mtext>
</semantics>
</math>

7
layout/reftests/mathml/mathcolor-4.mml
View File

@ -1,7 +0,0 @@
<!-- test mathcolor on a non-presentation element -->
<math xmlns="http://www.w3.org/1998/Math/MathML">
<semantics mathcolor="green">
<mtext>□■□■□■□</mtext>
</semantics>
</math>

8
layout/reftests/mathml/reftest.list
View File

@ -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