[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 12:58:13 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 7f9f8f0119c44a002c0541b5104d63c9b3d67c0f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Sep 3 03:45:06 2010 +0000
2010-09-02 François Sausset <sausset at gmail.com>
Reviewed by Darin Adler.
MathML mo element should render "hyphen-minus" as "minus sign" (Unicode glyph names).
https://bugs.webkit.org/show_bug.cgi?id=43629
* mathml/presentation/mo.xhtml:
* platform/mac/mathml/presentation/mo-expected.checksum:
* platform/mac/mathml/presentation/mo-expected.png:
* platform/mac/mathml/presentation/mo-expected.txt:
2010-09-02 François Sausset <sausset at gmail.com>
Reviewed by Darin Adler.
MathML mo element should render "hyphen-minus" as "minus sign" (Unicode glyph names).
https://bugs.webkit.org/show_bug.cgi?id=43629
Test: mathml/presentation/mo.xhtml
* mathml/RenderMathMLOperator.cpp:
(WebCore::RenderMathMLOperator::RenderMathMLOperator):
(WebCore::RenderMathMLOperator::updateFromElement):
* mathml/RenderMathMLOperator.h:
(WebCore::convertHyphenMinusToMinusSign):
* platform/text/CharacterNames.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66708 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5491f5f..d8489e7 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-02 François Sausset <sausset at gmail.com>
+
+ Reviewed by Darin Adler.
+
+ MathML mo element should render "hyphen-minus" as "minus sign" (Unicode glyph names).
+ https://bugs.webkit.org/show_bug.cgi?id=43629
+
+ * mathml/presentation/mo.xhtml:
+ * platform/mac/mathml/presentation/mo-expected.checksum:
+ * platform/mac/mathml/presentation/mo-expected.png:
+ * platform/mac/mathml/presentation/mo-expected.txt:
+
2010-09-02 Kent Tamura <tkent at chromium.org>
Unreviewed, test expectation update.
diff --git a/LayoutTests/mathml/presentation/mo.xhtml b/LayoutTests/mathml/presentation/mo.xhtml
index e2fe875..202ed0b 100644
--- a/LayoutTests/mathml/presentation/mo.xhtml
+++ b/LayoutTests/mathml/presentation/mo.xhtml
@@ -9,27 +9,39 @@
<math xmlns='http://www.w3.org/1998/Math/MathML'>
<mo mathsize='small'>∑</mo>
</math>
-operator:
+, operator:
<math xmlns='http://www.w3.org/1998/Math/MathML'>
<mo mathsize='small'>B</mo>
</math>
+, minus operator:
+<math xmlns='http://www.w3.org/1998/Math/MathML'>
+<mo mathsize='small'>-</mo>
+</math>
</p>
<p id='t2'>operator:
<math xmlns='http://www.w3.org/1998/Math/MathML'>
<mo mathsize='normal'>∑</mo>
</math>
-operator:
+, operator:
<math xmlns='http://www.w3.org/1998/Math/MathML'>
<mo mathsize='normal'>B</mo>
</math>
+, minus operator:
+<math xmlns='http://www.w3.org/1998/Math/MathML'>
+<mo mathsize='normal'>-</mo>
+</math>
</p>
<p id='t3'>operator:
<math xmlns='http://www.w3.org/1998/Math/MathML'>
<mo mathsize='big'>∑</mo>
</math>
-operator:
+, operator:
<math xmlns='http://www.w3.org/1998/Math/MathML'>
-<mo mathsize='big'>∑</mo>
+<mo mathsize='big'>B</mo>
+</math>
+, minus operator:
+<math xmlns='http://www.w3.org/1998/Math/MathML'>
+<mo mathsize='big'>-</mo>
</math>
</p>
<p id='t4'>operator:
@@ -38,12 +50,18 @@ operator:
<mo mathsize='normal'>∑</mo>
<mo mathsize='big'>∑</mo>
</math>
-operator:
+, operator:
<math xmlns='http://www.w3.org/1998/Math/MathML'>
<mo mathsize='small'>B</mo>
<mo mathsize='normal'>B</mo>
<mo mathsize='big'>B</mo>
</math>
+, minus operator:
+<math xmlns='http://www.w3.org/1998/Math/MathML'>
+<mo mathsize='small'>-</mo>
+<mo mathsize='normal'>-</mo>
+<mo mathsize='big'>-</mo>
+</math>
</p>
<p id='t5'>operator:
<math xmlns='http://www.w3.org/1998/Math/MathML'>
diff --git a/LayoutTests/platform/mac/mathml/presentation/mo-expected.checksum b/LayoutTests/platform/mac/mathml/presentation/mo-expected.checksum
index 5980c32..dc1d2b4 100644
--- a/LayoutTests/platform/mac/mathml/presentation/mo-expected.checksum
+++ b/LayoutTests/platform/mac/mathml/presentation/mo-expected.checksum
@@ -1 +1 @@
-fc8e995b641f01562145b5272d953479
\ No newline at end of file
+06b6ee71337f8ef80ea3567065c88fbe
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/mathml/presentation/mo-expected.png b/LayoutTests/platform/mac/mathml/presentation/mo-expected.png
index 1e4d653..8c2058a 100644
Binary files a/LayoutTests/platform/mac/mathml/presentation/mo-expected.png and b/LayoutTests/platform/mac/mathml/presentation/mo-expected.png differ
diff --git a/LayoutTests/platform/mac/mathml/presentation/mo-expected.txt b/LayoutTests/platform/mac/mathml/presentation/mo-expected.txt
index c3a4c09..17af855 100644
--- a/LayoutTests/platform/mac/mathml/presentation/mo-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/mo-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x259
- RenderBlock {html} at (0,0) size 800x259
- RenderBody {body} at (8,16) size 784x227
+layer at (0,0) size 800x266
+ RenderBlock {html} at (0,0) size 800x266
+ RenderBody {body} at (8,16) size 784x234
RenderBlock {p} at (0,0) size 784x22
RenderText {#text} at (0,0) size 60x18
text run at (0,0) width 60: "operator: "
@@ -11,13 +11,20 @@ layer at (0,0) size 800x259
RenderBlock {mo} at (0,0) size 9x12
RenderText {mo} at (0,0) size 9x12
text run at (0,0) width 9: "\x{2211}"
- RenderText {#text} at (71,0) size 64x18
- text run at (71,0) width 64: " operator: "
- RenderBlock {math} at (135,2) size 10x20
+ RenderText {#text} at (71,0) size 72x18
+ text run at (71,0) width 72: " , operator: "
+ RenderBlock {math} at (143,2) size 10x20
RenderBlock {mo} at (1,0) size 8x16
RenderBlock {mo} at (0,0) size 8x16
RenderText {mo} at (0,4) size 8x12
text run at (0,4) width 8: "B"
+ RenderText {#text} at (153,0) size 114x18
+ text run at (153,0) width 114: " , minus operator: "
+ RenderBlock {math} at (267,6) size 9x16
+ RenderBlock {mo} at (1,0) size 7x12
+ RenderBlock {mo} at (0,0) size 7x12
+ RenderText {mo} at (0,0) size 7x12
+ text run at (0,0) width 7: "\x{2212}"
RenderText {#text} at (0,0) size 0x0
RenderBlock {p} at (0,38) size 784x22
RenderText {#text} at (0,3) size 60x18
@@ -27,31 +34,45 @@ layer at (0,0) size 800x259
RenderBlock {mo} at (0,0) size 11x16
RenderText {mo} at (0,0) size 11x16
text run at (0,0) width 11: "\x{2211}"
- RenderText {#text} at (73,3) size 64x18
- text run at (73,3) width 64: " operator: "
- RenderBlock {math} at (137,0) size 13x22
+ RenderText {#text} at (73,3) size 72x18
+ text run at (73,3) width 72: " , operator: "
+ RenderBlock {math} at (145,0) size 13x22
RenderBlock {mo} at (1,0) size 11x22
RenderBlock {mo} at (0,0) size 11x22
RenderText {mo} at (0,6) size 11x16
text run at (0,6) width 11: "B"
+ RenderText {#text} at (158,3) size 114x18
+ text run at (158,3) width 114: " , minus operator: "
+ RenderBlock {math} at (272,6) size 11x16
+ RenderBlock {mo} at (1,0) size 9x16
+ RenderBlock {mo} at (0,0) size 9x16
+ RenderText {mo} at (0,0) size 9x16
+ text run at (0,0) width 9: "\x{2212}"
RenderText {#text} at (0,0) size 0x0
- RenderBlock {p} at (0,76) size 784x24
- RenderText {#text} at (0,3) size 60x18
- text run at (0,3) width 60: "operator: "
- RenderBlock {math} at (60,0) size 21x24
- RenderBlock {mo} at (1,0) size 19x24
- RenderBlock {mo} at (1,0) size 17x24
- RenderText {mo} at (0,0) size 17x24
- text run at (0,0) width 17: "\x{2211}"
- RenderText {#text} at (81,3) size 64x18
- text run at (81,3) width 64: " operator: "
- RenderBlock {math} at (145,0) size 21x24
+ RenderBlock {p} at (0,76) size 784x31
+ RenderText {#text} at (0,10) size 60x18
+ text run at (0,10) width 60: "operator: "
+ RenderBlock {math} at (60,7) size 21x24
RenderBlock {mo} at (1,0) size 19x24
RenderBlock {mo} at (1,0) size 17x24
RenderText {mo} at (0,0) size 17x24
text run at (0,0) width 17: "\x{2211}"
+ RenderText {#text} at (81,10) size 72x18
+ text run at (81,10) width 72: " , operator: "
+ RenderBlock {math} at (153,0) size 20x31
+ RenderBlock {mo} at (1,0) size 18x31
+ RenderBlock {mo} at (1,0) size 16x31
+ RenderText {mo} at (0,7) size 16x24
+ text run at (0,7) width 16: "B"
+ RenderText {#text} at (173,10) size 114x18
+ text run at (173,10) width 114: " , minus operator: "
+ RenderBlock {math} at (287,7) size 17x24
+ RenderBlock {mo} at (1,0) size 15x24
+ RenderBlock {mo} at (1,0) size 13x24
+ RenderText {mo} at (0,0) size 13x24
+ text run at (0,0) width 13: "\x{2212}"
RenderText {#text} at (0,0) size 0x0
- RenderBlock {p} at (0,116) size 784x32
+ RenderBlock {p} at (0,123) size 784x32
RenderText {#text} at (0,6) size 60x18
text run at (0,6) width 60: "operator: "
RenderBlock {math} at (60,4) size 41x25
@@ -67,9 +88,9 @@ layer at (0,0) size 800x259
RenderBlock {mo} at (1,0) size 17x24
RenderText {mo} at (0,0) size 17x24
text run at (0,0) width 17: "\x{2211}"
- RenderText {#text} at (101,6) size 64x18
- text run at (101,6) width 64: " operator: "
- RenderBlock {math} at (165,0) size 39x32
+ RenderText {#text} at (101,6) size 72x18
+ text run at (101,6) width 72: " , operator: "
+ RenderBlock {math} at (173,0) size 39x32
RenderBlock {mo} at (1,4) size 8x24
RenderBlock {mo} at (0,0) size 8x24
RenderText {mo} at (0,12) size 8x12
@@ -82,8 +103,23 @@ layer at (0,0) size 800x259
RenderBlock {mo} at (1,0) size 16x31
RenderText {mo} at (0,7) size 16x24
text run at (0,7) width 16: "B"
+ RenderText {#text} at (212,6) size 114x18
+ text run at (212,6) width 114: " , minus operator: "
+ RenderBlock {math} at (326,4) size 33x25
+ RenderBlock {mo} at (1,1) size 7x20
+ RenderBlock {mo} at (0,0) size 7x20
+ RenderText {mo} at (0,8) size 7x12
+ text run at (0,8) width 7: "\x{2212}"
+ RenderBlock {mo} at (8,0) size 9x22
+ RenderBlock {mo} at (0,0) size 9x22
+ RenderText {mo} at (0,6) size 9x16
+ text run at (0,6) width 9: "\x{2212}"
+ RenderBlock {mo} at (17,0) size 15x24
+ RenderBlock {mo} at (1,0) size 13x24
+ RenderText {mo} at (0,0) size 13x24
+ text run at (0,0) width 13: "\x{2212}"
RenderText {#text} at (0,0) size 0x0
- RenderBlock {p} at (0,164) size 784x63
+ RenderBlock {p} at (0,171) size 784x63
RenderText {#text} at (0,22) size 60x18
text run at (0,22) width 60: "operator: "
RenderBlock {math} at (60,0) size 100x63
@@ -95,199 +131,199 @@ layer at (0,0) size 800x259
RenderBlock {mo} at (87,0) size 5x63
RenderBlock {mo} at (92,0) size 7x63
RenderText {#text} at (0,0) size 0x0
-layer at (69,180) size 8x10 scrollHeight 15
+layer at (69,187) size 8x10 scrollHeight 15
RenderBlock {mo} at (0,0) size 8x10
-layer at (69,190) size 8x10 scrollHeight 14
+layer at (69,197) size 8x10 scrollHeight 14
RenderBlock {mo} at (0,10) size 8x10
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (69,200) size 8x10 scrollHeight 14
+layer at (69,207) size 8x10 scrollHeight 14
RenderBlock {mo} at (0,20) size 8x10
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (69,210) size 8x10 scrollHeight 14
+layer at (69,217) size 8x10 scrollHeight 14
RenderBlock {mo} at (0,30) size 8x10
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (69,220) size 8x10 scrollHeight 14
+layer at (69,227) size 8x10 scrollHeight 14
RenderBlock {mo} at (0,40) size 8x10
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (69,230) size 8x2 scrollHeight 14
+layer at (69,237) size 8x2 scrollHeight 14
RenderBlock {mo} at (0,50) size 8x2
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (69,232) size 8x11 scrollHeight 14
+layer at (69,239) size 8x11 scrollHeight 14
RenderBlock {mo} at (0,52) size 8x11
-layer at (77,180) size 10x10 scrollHeight 15
+layer at (77,187) size 10x10 scrollHeight 15
RenderBlock {mo} at (0,0) size 10x10
-layer at (77,190) size 10x10 scrollHeight 14
+layer at (77,197) size 10x10 scrollHeight 14
RenderBlock {mo} at (0,10) size 10x10
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{23AE}"
-layer at (77,200) size 10x10 scrollHeight 14
+layer at (77,207) size 10x10 scrollHeight 14
RenderBlock {mo} at (0,20) size 10x10
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{23AE}"
-layer at (77,210) size 10x10 scrollHeight 14
+layer at (77,217) size 10x10 scrollHeight 14
RenderBlock {mo} at (0,30) size 10x10
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{23AE}"
-layer at (77,220) size 10x10 scrollHeight 14
+layer at (77,227) size 10x10 scrollHeight 14
RenderBlock {mo} at (0,40) size 10x10
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{23AE}"
-layer at (77,230) size 10x2 scrollHeight 14
+layer at (77,237) size 10x2 scrollHeight 14
RenderBlock {mo} at (0,50) size 10x2
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{23AE}"
-layer at (77,232) size 10x11 scrollHeight 14
+layer at (77,239) size 10x11 scrollHeight 14
RenderBlock {mo} at (0,52) size 10x11
-layer at (87,180) size 7x10 scrollHeight 15
+layer at (87,187) size 7x10 scrollHeight 15
RenderBlock {mo} at (0,0) size 7x10
-layer at (87,190) size 7x10 scrollHeight 14
+layer at (87,197) size 7x10 scrollHeight 14
RenderBlock {mo} at (0,10) size 7x10
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AA}"
-layer at (87,200) size 7x6 scrollHeight 14
+layer at (87,207) size 7x6 scrollHeight 14
RenderBlock {mo} at (0,20) size 7x6
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AA}"
-layer at (87,206) size 7x10 scrollHeight 14
+layer at (87,213) size 7x10 scrollHeight 14
RenderBlock {mo} at (0,26) size 7x10
-layer at (87,216) size 7x10 scrollHeight 14
+layer at (87,223) size 7x10 scrollHeight 14
RenderBlock {mo} at (0,36) size 7x10
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AA}"
-layer at (87,226) size 7x6 scrollHeight 14
+layer at (87,233) size 7x6 scrollHeight 14
RenderBlock {mo} at (0,46) size 7x6
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AA}"
-layer at (87,232) size 7x11 scrollHeight 14
+layer at (87,239) size 7x11 scrollHeight 14
RenderBlock {mo} at (0,52) size 7x11
-layer at (94,180) size 5x10 scrollHeight 15
+layer at (94,187) size 5x10 scrollHeight 15
RenderBlock {mo} at (0,0) size 5x10
-layer at (94,190) size 5x10 scrollHeight 14
+layer at (94,197) size 5x10 scrollHeight 14
RenderBlock {mo} at (0,10) size 5x10
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A2}"
-layer at (94,200) size 5x10 scrollHeight 14
+layer at (94,207) size 5x10 scrollHeight 14
RenderBlock {mo} at (0,20) size 5x10
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A2}"
-layer at (94,210) size 5x10 scrollHeight 14
+layer at (94,217) size 5x10 scrollHeight 14
RenderBlock {mo} at (0,30) size 5x10
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A2}"
-layer at (94,220) size 5x10 scrollHeight 14
+layer at (94,227) size 5x10 scrollHeight 14
RenderBlock {mo} at (0,40) size 5x10
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A2}"
-layer at (94,230) size 5x2 scrollHeight 14
+layer at (94,237) size 5x2 scrollHeight 14
RenderBlock {mo} at (0,50) size 5x2
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A2}"
-layer at (94,232) size 5x11 scrollHeight 14
+layer at (94,239) size 5x11 scrollHeight 14
RenderBlock {mo} at (0,52) size 5x11
-layer at (155,180) size 5x10 scrollHeight 15
+layer at (155,187) size 5x10 scrollHeight 15
RenderBlock {mo} at (0,0) size 5x10
-layer at (155,190) size 5x10 scrollHeight 14
+layer at (155,197) size 5x10 scrollHeight 14
RenderBlock {mo} at (0,10) size 5x10
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A5}"
-layer at (155,200) size 5x10 scrollHeight 14
+layer at (155,207) size 5x10 scrollHeight 14
RenderBlock {mo} at (0,20) size 5x10
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A5}"
-layer at (155,210) size 5x10 scrollHeight 14
+layer at (155,217) size 5x10 scrollHeight 14
RenderBlock {mo} at (0,30) size 5x10
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A5}"
-layer at (155,220) size 5x10 scrollHeight 14
+layer at (155,227) size 5x10 scrollHeight 14
RenderBlock {mo} at (0,40) size 5x10
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A5}"
-layer at (155,230) size 5x2 scrollHeight 14
+layer at (155,237) size 5x2 scrollHeight 14
RenderBlock {mo} at (0,50) size 5x2
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A5}"
-layer at (155,232) size 5x11 scrollHeight 14
+layer at (155,239) size 5x11 scrollHeight 14
RenderBlock {mo} at (0,52) size 5x11
-layer at (160,180) size 7x10 scrollHeight 15
+layer at (160,187) size 7x10 scrollHeight 15
RenderBlock {mo} at (0,0) size 7x10
-layer at (160,190) size 7x10 scrollHeight 14
+layer at (160,197) size 7x10 scrollHeight 14
RenderBlock {mo} at (0,10) size 7x10
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AA}"
-layer at (160,200) size 7x6 scrollHeight 14
+layer at (160,207) size 7x6 scrollHeight 14
RenderBlock {mo} at (0,20) size 7x6
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AA}"
-layer at (160,206) size 7x10 scrollHeight 14
+layer at (160,213) size 7x10 scrollHeight 14
RenderBlock {mo} at (0,26) size 7x10
-layer at (160,216) size 7x10 scrollHeight 14
+layer at (160,223) size 7x10 scrollHeight 14
RenderBlock {mo} at (0,36) size 7x10
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AA}"
-layer at (160,226) size 7x6 scrollHeight 14
+layer at (160,233) size 7x6 scrollHeight 14
RenderBlock {mo} at (0,46) size 7x6
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AA}"
-layer at (160,232) size 7x11 scrollHeight 14
+layer at (160,239) size 7x11 scrollHeight 14
RenderBlock {mo} at (0,52) size 7x11
-layer at (69,181) size 8x14 backgroundClip at (69,180) size 8x10 clip at (69,180) size 8x10 outlineClip at (69,180) size 8x10
+layer at (69,188) size 8x14 backgroundClip at (69,187) size 8x10 clip at (69,187) size 8x10 outlineClip at (69,187) size 8x10
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (69,229) size 8x14 backgroundClip at (69,232) size 8x11 clip at (69,232) size 8x11 outlineClip at (69,232) size 8x11
+layer at (69,236) size 8x14 backgroundClip at (69,239) size 8x11 clip at (69,239) size 8x11 outlineClip at (69,239) size 8x11
RenderBlock (relative positioned) {mo} at (0,0) size 8x11
RenderText {mo} at (0,-3) size 8x17
text run at (0,-3) width 8: "\x{23D0}"
-layer at (77,181) size 10x14 backgroundClip at (77,180) size 10x10 clip at (77,180) size 10x10 outlineClip at (77,180) size 10x10
+layer at (77,188) size 10x14 backgroundClip at (77,187) size 10x10 clip at (77,187) size 10x10 outlineClip at (77,187) size 10x10
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2320}"
-layer at (77,229) size 10x14 backgroundClip at (77,232) size 10x11 clip at (77,232) size 10x11 outlineClip at (77,232) size 10x11
+layer at (77,236) size 10x14 backgroundClip at (77,239) size 10x11 clip at (77,239) size 10x11 outlineClip at (77,239) size 10x11
RenderBlock (relative positioned) {mo} at (0,0) size 10x11
RenderText {mo} at (0,-3) size 10x17
text run at (0,-3) width 10: "\x{2321}"
-layer at (87,181) size 7x14 backgroundClip at (87,180) size 7x10 clip at (87,180) size 7x10 outlineClip at (87,180) size 7x10
+layer at (87,188) size 7x14 backgroundClip at (87,187) size 7x10 clip at (87,187) size 7x10 outlineClip at (87,187) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A7}"
-layer at (87,205) size 7x14 backgroundClip at (87,206) size 7x10 clip at (87,206) size 7x10 outlineClip at (87,206) size 7x10
+layer at (87,212) size 7x14 backgroundClip at (87,213) size 7x10 clip at (87,213) size 7x10 outlineClip at (87,213) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A8}"
-layer at (87,229) size 7x14 backgroundClip at (87,232) size 7x11 clip at (87,232) size 7x11 outlineClip at (87,232) size 7x11
+layer at (87,236) size 7x14 backgroundClip at (87,239) size 7x11 clip at (87,239) size 7x11 outlineClip at (87,239) size 7x11
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23A9}"
-layer at (94,181) size 5x14 backgroundClip at (94,180) size 5x10 clip at (94,180) size 5x10 outlineClip at (94,180) size 5x10
+layer at (94,188) size 5x14 backgroundClip at (94,187) size 5x10 clip at (94,187) size 5x10 outlineClip at (94,187) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A1}"
-layer at (94,229) size 5x14 backgroundClip at (94,232) size 5x11 clip at (94,232) size 5x11 outlineClip at (94,232) size 5x11
+layer at (94,236) size 5x14 backgroundClip at (94,239) size 5x11 clip at (94,239) size 5x11 outlineClip at (94,239) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A3}"
-layer at (155,181) size 5x14 backgroundClip at (155,180) size 5x10 clip at (155,180) size 5x10 outlineClip at (155,180) size 5x10
+layer at (155,188) size 5x14 backgroundClip at (155,187) size 5x10 clip at (155,187) size 5x10 outlineClip at (155,187) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A4}"
-layer at (155,229) size 5x14 backgroundClip at (155,232) size 5x11 clip at (155,232) size 5x11 outlineClip at (155,232) size 5x11
+layer at (155,236) size 5x14 backgroundClip at (155,239) size 5x11 clip at (155,239) size 5x11 outlineClip at (155,239) size 5x11
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A6}"
-layer at (160,181) size 7x14 backgroundClip at (160,180) size 7x10 clip at (160,180) size 7x10 outlineClip at (160,180) size 7x10
+layer at (160,188) size 7x14 backgroundClip at (160,187) size 7x10 clip at (160,187) size 7x10 outlineClip at (160,187) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AB}"
-layer at (160,205) size 7x14 backgroundClip at (160,206) size 7x10 clip at (160,206) size 7x10 outlineClip at (160,206) size 7x10
+layer at (160,212) size 7x14 backgroundClip at (160,213) size 7x10 clip at (160,213) size 7x10 outlineClip at (160,213) size 7x10
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AC}"
-layer at (160,229) size 7x14 backgroundClip at (160,232) size 7x11 clip at (160,232) size 7x11 outlineClip at (160,232) size 7x11
+layer at (160,236) size 7x14 backgroundClip at (160,239) size 7x11 clip at (160,239) size 7x11 outlineClip at (160,239) size 7x11
RenderBlock (relative positioned) {mo} at (0,0) size 7x11
RenderText {mo} at (0,-3) size 7x17
text run at (0,-3) width 7: "\x{23AD}"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 98fff40..d3c32a5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2010-09-02 François Sausset <sausset at gmail.com>
+
+ Reviewed by Darin Adler.
+
+ MathML mo element should render "hyphen-minus" as "minus sign" (Unicode glyph names).
+ https://bugs.webkit.org/show_bug.cgi?id=43629
+
+ Test: mathml/presentation/mo.xhtml
+
+ * mathml/RenderMathMLOperator.cpp:
+ (WebCore::RenderMathMLOperator::RenderMathMLOperator):
+ (WebCore::RenderMathMLOperator::updateFromElement):
+ * mathml/RenderMathMLOperator.h:
+ (WebCore::convertHyphenMinusToMinusSign):
+ * platform/text/CharacterNames.h:
+
2010-09-02 Kenneth Russell <kbr at google.com>
Reviewed by Darin Fisher.
diff --git a/WebCore/mathml/RenderMathMLOperator.cpp b/WebCore/mathml/RenderMathMLOperator.cpp
index f9ff630..a6778a9 100644
--- a/WebCore/mathml/RenderMathMLOperator.cpp
+++ b/WebCore/mathml/RenderMathMLOperator.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2010 Alex Milowski (alex at milowski.com). All rights reserved.
+ * Copyright (C) 2010 François Sausset (sausset at gmail.com). All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -47,7 +48,7 @@ RenderMathMLOperator::RenderMathMLOperator(Node* container)
RenderMathMLOperator::RenderMathMLOperator(Node* container, UChar operatorChar)
: RenderMathMLBlock(container)
, m_stretchHeight(0)
- , m_operator(operatorChar)
+ , m_operator(convertHyphenMinusToMinusSign(operatorChar))
{
}
@@ -217,7 +218,7 @@ void RenderMathMLOperator::updateFromElement()
text = new (renderArena()) RenderText(node(), StringImpl::create(&m_operator, 1));
else if (node()->nodeType() == Node::ELEMENT_NODE)
if (Element* mo = static_cast<Element*>(node()))
- text = new (renderArena()) RenderText(node(), StringImpl::create(mo->textContent().characters(), mo->textContent().length()));
+ text = new (renderArena()) RenderText(node(), mo->textContent().replace(hyphenMinus, minusSign).impl());
// If we can't figure out the text, leave it blank.
if (text) {
RefPtr<RenderStyle> textStyle = RenderStyle::create();
diff --git a/WebCore/mathml/RenderMathMLOperator.h b/WebCore/mathml/RenderMathMLOperator.h
index cc183c3..99c5246 100644
--- a/WebCore/mathml/RenderMathMLOperator.h
+++ b/WebCore/mathml/RenderMathMLOperator.h
@@ -28,6 +28,7 @@
#if ENABLE(MATHML)
+#include "CharacterNames.h"
#include "RenderMathMLBlock.h"
namespace WebCore {
@@ -65,9 +66,17 @@ inline const RenderMathMLOperator* toRenderMathMLOperator(const RenderMathMLBloc
ASSERT(!block || block->isRenderMathMLOperator());
return static_cast<const RenderMathMLOperator*>(block);
}
+
+inline UChar convertHyphenMinusToMinusSign(UChar glyph)
+{
+ // When rendered as a mathematical operator, minus glyph should be larger.
+ if (glyph == hyphenMinus)
+ return minusSign;
+ return glyph;
}
+}
#endif // ENABLE(MATHML)
#endif // RenderMathMLOperator_h
diff --git a/WebCore/platform/text/CharacterNames.h b/WebCore/platform/text/CharacterNames.h
index f06246c..9f8f807 100644
--- a/WebCore/platform/text/CharacterNames.h
+++ b/WebCore/platform/text/CharacterNames.h
@@ -52,6 +52,7 @@ const UChar leftSingleQuotationMark = 0x2018;
const UChar leftToRightEmbed = 0x202A;
const UChar leftToRightMark = 0x200E;
const UChar leftToRightOverride = 0x202D;
+const UChar minusSign = 0x2212;
const UChar newlineCharacter = 0x000A;
const UChar noBreakSpace = 0x00A0;
const UChar objectReplacementCharacter = 0xFFFC;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list