[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:20 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3b491bac1431ee2559fd8a511ad1ab8606278102
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Aug 9 15:52:15 2010 +0000
2010-08-09 François Sausset <sausset at gmail.com>
Reviewed by Kenneth Rohde Christiansen.
Add a test for mroot color handling.
https://bugs.webkit.org/show_bug.cgi?id=43628
* mathml/presentation/roots.xhtml:
* platform/mac/mathml/presentation/roots-expected.checksum:
* platform/mac/mathml/presentation/roots-expected.png:
* platform/mac/mathml/presentation/roots-expected.txt:
2010-08-09 François Sausset <sausset at gmail.com>
Reviewed by Kenneth Rohde Christiansen.
Take into account style color to draw MathML mroot radical.
https://bugs.webkit.org/show_bug.cgi?id=43628
Test: mathml/presentation/roots.xhtml
* mathml/RenderMathMLRoot.cpp:
(WebCore::RenderMathMLRoot::paint):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64984 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index bb2b5a7..6a060f1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,18 @@
Reviewed by Kenneth Rohde Christiansen.
+ Add a test for mroot color handling.
+ https://bugs.webkit.org/show_bug.cgi?id=43628
+
+ * mathml/presentation/roots.xhtml:
+ * platform/mac/mathml/presentation/roots-expected.checksum:
+ * platform/mac/mathml/presentation/roots-expected.png:
+ * platform/mac/mathml/presentation/roots-expected.txt:
+
+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
diff --git a/LayoutTests/mathml/presentation/roots.xhtml b/LayoutTests/mathml/presentation/roots.xhtml
index fa16584..c32c0e7 100644
--- a/LayoutTests/mathml/presentation/roots.xhtml
+++ b/LayoutTests/mathml/presentation/roots.xhtml
@@ -26,8 +26,8 @@
</mfrac>
</msqrt>
</math></p>
-<p id='t5'>cube root:
-<math xmlns='http://www.w3.org/1998/Math/MathML'>
+<p id='t5'>cube root (should be blue):
+<math xmlns='http://www.w3.org/1998/Math/MathML' mathcolor="blue">
<mroot><mn>2</mn><mn>3</mn></mroot>
</math></p>
<p id='t6'>long index:
diff --git a/LayoutTests/platform/mac/mathml/presentation/roots-expected.checksum b/LayoutTests/platform/mac/mathml/presentation/roots-expected.checksum
index 6eef73f..677277b 100644
--- a/LayoutTests/platform/mac/mathml/presentation/roots-expected.checksum
+++ b/LayoutTests/platform/mac/mathml/presentation/roots-expected.checksum
@@ -1 +1 @@
-32ee207ef5f9e6019f6bc7bf7ee6ed6f
\ No newline at end of file
+39f14ad3db8dbca4eefef2322beee1d6
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/mathml/presentation/roots-expected.png b/LayoutTests/platform/mac/mathml/presentation/roots-expected.png
index 6d296ad..9b476bc 100644
Binary files a/LayoutTests/platform/mac/mathml/presentation/roots-expected.png and b/LayoutTests/platform/mac/mathml/presentation/roots-expected.png differ
diff --git a/LayoutTests/platform/mac/mathml/presentation/roots-expected.txt b/LayoutTests/platform/mac/mathml/presentation/roots-expected.txt
index b33bff3..6bb37cb 100644
--- a/LayoutTests/platform/mac/mathml/presentation/roots-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/roots-expected.txt
@@ -77,9 +77,9 @@ layer at (0,0) size 800x594
RenderText {#text} at (17,3) size 8x16
text run at (17,3) width 8: "2"
RenderBlock {p} at (0,186) size 784x20
- RenderText {#text} at (0,1) size 67x18
- text run at (0,1) width 67: "cube root: "
- RenderBlock {math} at (67,0) size 22x20
+ RenderText {#text} at (0,1) size 173x18
+ text run at (0,1) width 173: "cube root (should be blue): "
+ RenderBlock {math} at (173,0) size 22x20 [color=#0000FF]
RenderBlock {p} at (0,222) size 784x24
RenderText {#text} at (0,5) size 75x18
text run at (0,5) width 75: "long index: "
@@ -168,14 +168,14 @@ layer at (0,0) size 800x594
text run at (0,41) width 110: "Imbricated roots: "
RenderBlock {math} at (110,0) size 340x81
RenderText {#text} at (0,0) size 0x0
-layer at (76,202) size 20x20
+layer at (182,202) size 20x20
RenderBlock (relative positioned) {mroot} at (1,0) size 20x20
RenderBlock {mroot} at (12,15) size 0x0
RenderBlock {mroot} at (12,4) size 8x16
RenderInline {mn} at (0,0) size 8x16
RenderText {#text} at (0,0) size 8x16
text run at (0,0) width 8: "2"
-layer at (76,202) size 12x14
+layer at (182,202) size 12x14
RenderBlock (positioned) {mn} at (0,0) size 12x14
RenderText {#text} at (2,0) size 6x12
text run at (2,0) width 6: "3"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bdd79c3..6002ba0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,18 @@
Reviewed by Kenneth Rohde Christiansen.
+ Take into account style color to draw MathML mroot radical.
+ https://bugs.webkit.org/show_bug.cgi?id=43628
+
+ Test: mathml/presentation/roots.xhtml
+
+ * mathml/RenderMathMLRoot.cpp:
+ (WebCore::RenderMathMLRoot::paint):
+
+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
diff --git a/WebCore/mathml/RenderMathMLRoot.cpp b/WebCore/mathml/RenderMathMLRoot.cpp
index 5bfff85..4ed8c19 100644
--- a/WebCore/mathml/RenderMathMLRoot.cpp
+++ b/WebCore/mathml/RenderMathMLRoot.cpp
@@ -148,7 +148,7 @@ void RenderMathMLRoot::paint(PaintInfo& info, int tx, int ty)
info.context->setStrokeThickness(gRadicalLineThickness * style()->fontSize());
info.context->setStrokeStyle(SolidStroke);
- info.context->setStrokeColor(style()->visitedDependentColor(CSSPropertyColor), sRGBColorSpace);
+ info.context->setStrokeColor(style()->visitedDependentColor(CSSPropertyColor), DeviceColorSpace);
info.context->setLineJoin(MiterJoin);
info.context->setMiterLimit(style()->fontSize());
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list