[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
eric at webkit.org
eric at webkit.org
Wed Dec 22 11:50:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 90554480330d7c089b29848aee27ee898ef929d8
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 9 15:40:40 2010 +0000
2010-08-09 François Sausset <sausset at gmail.com>
Reviewed by Kenneth Rohde Christiansen.
Add test for some deprecated MathML style attributes
https://bugs.webkit.org/show_bug.cgi?id=43503
* mathml/presentation/attributes.xhtml:
* platform/mac/mathml/presentation/attributes-expected.checksum:
* platform/mac/mathml/presentation/attributes-expected.png:
* platform/mac/mathml/presentation/attributes-expected.txt:
2010-08-09 François Sausset <sausset at gmail.com>
Reviewed by Kenneth Rohde Christiansen.
Implement MathML deprecated style attributes
https://bugs.webkit.org/show_bug.cgi?id=43503
Test: mathml/presentation/attributes.xhtml
* mathml/MathMLElement.cpp:
(WebCore::MathMLElement::mapToEntry):
(WebCore::MathMLElement::parseMappedAttribute):
* mathml/mathattrs.in:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64982 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d3d682a..bb2b5a7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-09 François Sausset <sausset at gmail.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Add test for some deprecated MathML style attributes
+ https://bugs.webkit.org/show_bug.cgi?id=43503
+
+ * mathml/presentation/attributes.xhtml:
+ * platform/mac/mathml/presentation/attributes-expected.checksum:
+ * platform/mac/mathml/presentation/attributes-expected.png:
+ * platform/mac/mathml/presentation/attributes-expected.txt:
+
2010-08-09 Pavel Feldman <pfeldman at chromium.org>
Not reviewed. Chromium expectations update.
diff --git a/LayoutTests/mathml/presentation/attributes.xhtml b/LayoutTests/mathml/presentation/attributes.xhtml
index e8579da..b45ced5 100644
--- a/LayoutTests/mathml/presentation/attributes.xhtml
+++ b/LayoutTests/mathml/presentation/attributes.xhtml
@@ -12,6 +12,9 @@
<mn mathcolor="#00F">1</mn>
<msqrt mathcolor="#0000FF"><mn>2</mn></msqrt>
</math>
+<math xmlns='http://www.w3.org/1998/Math/MathML' background="orange">
+<mfrac color="blue"><mi>x</mi><mi>y</mi></mfrac>
+</math>
</p>
<p id='t2'>following elements should appear with increasing size:
<math xmlns='http://www.w3.org/1998/Math/MathML'>
@@ -29,5 +32,13 @@
<mi mathvariant="bold-italic">A</mi>
</math>
</p>
+<p id='t4'>test font style attributes:
+<math xmlns='http://www.w3.org/1998/Math/MathML'>
+<mtext fontsize="2em">A</mtext>
+<mtext fontfamily="sans-serif">A</mtext>
+<mtext fontstyle="italic">A</mtext>
+<mtext fontweight="bold">A</mtext>
+</math>
+</p>
</body>
</html>
diff --git a/LayoutTests/platform/mac/mathml/presentation/attributes-expected.checksum b/LayoutTests/platform/mac/mathml/presentation/attributes-expected.checksum
index d52cda7..451865c 100644
--- a/LayoutTests/platform/mac/mathml/presentation/attributes-expected.checksum
+++ b/LayoutTests/platform/mac/mathml/presentation/attributes-expected.checksum
@@ -1 +1 @@
-573c0ea5a0013b193f34b258498e0a6e
\ No newline at end of file
+684bc130d96bc4b74df32b4b69116b31
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/mathml/presentation/attributes-expected.png b/LayoutTests/platform/mac/mathml/presentation/attributes-expected.png
index af30235..0c6b146 100644
Binary files a/LayoutTests/platform/mac/mathml/presentation/attributes-expected.png and b/LayoutTests/platform/mac/mathml/presentation/attributes-expected.png differ
diff --git a/LayoutTests/platform/mac/mathml/presentation/attributes-expected.txt b/LayoutTests/platform/mac/mathml/presentation/attributes-expected.txt
index aee06ca..2971ddb 100644
--- a/LayoutTests/platform/mac/mathml/presentation/attributes-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/attributes-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x163
- RenderBlock {html} at (0,0) size 800x163
- RenderBody {body} at (8,16) size 784x131
+layer at (0,0) size 800x216
+ RenderBlock {html} at (0,0) size 800x216
+ RenderBody {body} at (8,16) size 784x184
RenderBlock {p} at (0,0) size 784x43
RenderText {#text} at (0,13) size 432x18
text run at (0,13) width 432: "following elements should appear in blue on an orange background: "
@@ -27,6 +27,18 @@ layer at (0,0) size 800x163
RenderInline {mn} at (0,0) size 8x16
RenderText {#text} at (12,3) size 8x16
text run at (12,3) width 8: "2"
+ RenderText {#text} at (486,13) size 4x18
+ text run at (486,13) width 4: " "
+ RenderBlock {math} at (490,3) size 15x40 [bgcolor=#FFA500]
+ RenderBlock {mfrac} at (1,0) size 13x40 [color=#0000FF]
+ RenderBlock {mfrac} at (0,0) size 13x19
+ RenderInline {mi} at (0,0) size 7x16
+ RenderText {#text} at (3,3) size 7x16
+ text run at (3,3) width 7: "x"
+ RenderBlock {mfrac} at (0,19) size 13x21
+ RenderInline {mi} at (0,0) size 7x16
+ RenderText {#text} at (3,5) size 7x16
+ text run at (3,5) width 7: "y"
RenderText {#text} at (0,0) size 0x0
RenderBlock {p} at (0,59) size 784x37
RenderText {#text} at (0,13) size 348x18
@@ -62,3 +74,20 @@ layer at (0,0) size 800x163
RenderText {#text} at (35,3) size 11x16
text run at (35,3) width 11: "A"
RenderText {#text} at (0,0) size 0x0
+ RenderBlock {p} at (0,147) size 784x37
+ RenderText {#text} at (0,13) size 152x18
+ text run at (0,13) width 152: "test font style attributes: "
+ RenderBlock {math} at (152,0) size 58x37
+ RenderInline {mtext} at (0,0) size 23x32
+ RenderText {#text} at (1,5) size 23x32
+ text run at (1,5) width 23: "A"
+ RenderInline {mtext} at (0,0) size 11x18
+ RenderText {#text} at (24,13) size 11x18
+ text run at (24,13) width 11: "A"
+ RenderInline {mtext} at (0,0) size 10x16
+ RenderText {#text} at (35,16) size 10x16
+ text run at (35,16) width 10: "A"
+ RenderInline {mtext} at (0,0) size 12x16
+ RenderText {#text} at (45,16) size 12x16
+ text run at (45,16) width 12: "A"
+ RenderText {#text} at (0,0) size 0x0
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0a0b7cd..bdd79c3 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-09 François Sausset <sausset at gmail.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Implement MathML deprecated style attributes
+ https://bugs.webkit.org/show_bug.cgi?id=43503
+
+ Test: mathml/presentation/attributes.xhtml
+
+ * mathml/MathMLElement.cpp:
+ (WebCore::MathMLElement::mapToEntry):
+ (WebCore::MathMLElement::parseMappedAttribute):
+ * mathml/mathattrs.in:
+
2010-08-09 Ilya Tikhonovsky <loislo at chromium.org>
Reviewed by Yury Semikhatsky.
diff --git a/WebCore/mathml/MathMLElement.cpp b/WebCore/mathml/MathMLElement.cpp
index 30d02da..6088810 100644
--- a/WebCore/mathml/MathMLElement.cpp
+++ b/WebCore/mathml/MathMLElement.cpp
@@ -50,7 +50,10 @@ PassRefPtr<MathMLElement> MathMLElement::create(const QualifiedName& tagName, Do
bool MathMLElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEntry& result) const
{
- if (attrName == MathMLNames::mathcolorAttr || attrName == MathMLNames::mathbackgroundAttr) {
+ if (attrName == mathcolorAttr || attrName == mathbackgroundAttr
+ || attrName == colorAttr || attrName == backgroundAttr
+ || attrName == fontsizeAttr || attrName == fontstyleAttr
+ || attrName == fontweightAttr || attrName == fontfamilyAttr) {
result = eMathML;
return false;
}
@@ -59,15 +62,27 @@ bool MathMLElement::mapToEntry(const QualifiedName& attrName, MappedAttributeEnt
void MathMLElement::parseMappedAttribute(Attribute* attr)
{
- if (attr->name() == MathMLNames::mathbackgroundAttr)
+ if (attr->name() == mathbackgroundAttr)
addCSSProperty(attr, CSSPropertyBackgroundColor, attr->value());
- else if (attr->name() == MathMLNames::mathcolorAttr)
- addCSSProperty(attr, CSSPropertyColor, attr->value());
- else if (attr->name() == MathMLNames::mathsizeAttr) {
+ else if (attr->name() == mathsizeAttr) {
// The following three values of mathsize are handled in WebCore/css/mathml.css
if (attr->value() != "normal" && attr->value() != "small" && attr->value() != "big")
addCSSProperty(attr, CSSPropertyFontSize, attr->value());
- }
+ } else if (attr->name() == mathcolorAttr)
+ addCSSProperty(attr, CSSPropertyColor, attr->value());
+ // FIXME: deprecated attributes that should loose in a conflict with a non deprecated attribute
+ else if (attr->name() == fontsizeAttr)
+ addCSSProperty(attr, CSSPropertyFontSize, attr->value());
+ else if (attr->name() == backgroundAttr)
+ addCSSProperty(attr, CSSPropertyBackgroundColor, attr->value());
+ else if (attr->name() == colorAttr)
+ addCSSProperty(attr, CSSPropertyColor, attr->value());
+ else if (attr->name() == fontstyleAttr)
+ addCSSProperty(attr, CSSPropertyFontStyle, attr->value());
+ else if (attr->name() == fontweightAttr)
+ addCSSProperty(attr, CSSPropertyFontWeight, attr->value());
+ else if (attr->name() == fontfamilyAttr)
+ addCSSProperty(attr, CSSPropertyFontFamily, attr->value());
else
StyledElement::parseMappedAttribute(attr);
}
diff --git a/WebCore/mathml/mathattrs.in b/WebCore/mathml/mathattrs.in
index 373b832..4fda481 100644
--- a/WebCore/mathml/mathattrs.in
+++ b/WebCore/mathml/mathattrs.in
@@ -3,9 +3,15 @@ namespaceURI="http://www.w3.org/1998/Math/MathML"
guardFactoryWith="ENABLE(MATHML)"
attrsNullNamespace
+background
close
+color
definitionURL
denomalign
+fontfamily
+fontsize
+fontstyle
+fontweight
linethickness
mathbackground
mathcolor
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list