[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 14:51:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3128246b832adc6557a3e15e573553adebc01615
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 22 13:31:40 2010 +0000
2010-10-22 François Sausset <sausset at gmail.com>
Reviewed by Kenneth Rohde Christiansen.
Fix wrong xHeight() value for Apple Symbols font.
https://bugs.webkit.org/show_bug.cgi?id=41535
* mathml/xHeight.xhtml: Added.
* platform/mac/mathml/presentation/fenced-expected.checksum:
* platform/mac/mathml/presentation/fenced-expected.png:
* platform/mac/mathml/presentation/fenced-expected.txt:
* platform/mac/mathml/presentation/row-alignment-expected.checksum:
* platform/mac/mathml/presentation/row-alignment-expected.png:
* platform/mac/mathml/presentation/row-alignment-expected.txt:
* platform/mac/mathml/presentation/tables-expected.checksum:
* platform/mac/mathml/presentation/tables-expected.png:
* platform/mac/mathml/presentation/tables-expected.txt:
* platform/mac/mathml/xHeight-expected.checksum: Added.
* platform/mac/mathml/xHeight-expected.png: Added.
* platform/mac/mathml/xHeight-expected.txt: Added.
2010-10-22 François Sausset <sausset at gmail.com>
Reviewed by Kenneth Rohde Christiansen.
Fix wrong xHeight() value for Apple Symbols font.
https://bugs.webkit.org/show_bug.cgi?id=41535
Test: mathml/xHeight.xhtml
* platform/graphics/mac/SimpleFontDataMac.mm:
(WebCore::SimpleFontData::platformInit):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70304 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6630d01..91bf6b9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2010-10-22 François Sausset <sausset at gmail.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Fix wrong xHeight() value for Apple Symbols font.
+ https://bugs.webkit.org/show_bug.cgi?id=41535
+
+ * mathml/xHeight.xhtml: Added.
+ * platform/mac/mathml/presentation/fenced-expected.checksum:
+ * platform/mac/mathml/presentation/fenced-expected.png:
+ * platform/mac/mathml/presentation/fenced-expected.txt:
+ * platform/mac/mathml/presentation/row-alignment-expected.checksum:
+ * platform/mac/mathml/presentation/row-alignment-expected.png:
+ * platform/mac/mathml/presentation/row-alignment-expected.txt:
+ * platform/mac/mathml/presentation/tables-expected.checksum:
+ * platform/mac/mathml/presentation/tables-expected.png:
+ * platform/mac/mathml/presentation/tables-expected.txt:
+ * platform/mac/mathml/xHeight-expected.checksum: Added.
+ * platform/mac/mathml/xHeight-expected.png: Added.
+ * platform/mac/mathml/xHeight-expected.txt: Added.
+
2010-10-22 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r70301.
diff --git a/LayoutTests/mathml/xHeight.xhtml b/LayoutTests/mathml/xHeight.xhtml
new file mode 100644
index 0000000..ed89c64
--- /dev/null
+++ b/LayoutTests/mathml/xHeight.xhtml
@@ -0,0 +1,12 @@
+<html xmlns='http://www.w3.org/1999/xhtml'>
+<head>
+</head>
+<body>
+<p id='t1'>The green square should be vertically centered:
+ <math xmlns='http://www.w3.org/1998/Math/MathML'>
+ <mi>x</mi>
+ <div xmlns='http://www.w3.org/1999/xhtml' style='display: inline-block; height: 20px; width: 20px; vertical-align: middle; background-color: rgb(0,255,0)'/>
+ </math>
+</p>
+</body>
+</html>
diff --git a/LayoutTests/platform/mac/mathml/presentation/fenced-expected.checksum b/LayoutTests/platform/mac/mathml/presentation/fenced-expected.checksum
index a982d4e..cf96ec0 100644
--- a/LayoutTests/platform/mac/mathml/presentation/fenced-expected.checksum
+++ b/LayoutTests/platform/mac/mathml/presentation/fenced-expected.checksum
@@ -1 +1 @@
-f9088cee3e26ced272aa5106fff2dddc
\ No newline at end of file
+b76262c6c2bc8e7c475f13fce3910691
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/mathml/presentation/fenced-expected.png b/LayoutTests/platform/mac/mathml/presentation/fenced-expected.png
index d7fd87e..80bf359 100644
Binary files a/LayoutTests/platform/mac/mathml/presentation/fenced-expected.png and b/LayoutTests/platform/mac/mathml/presentation/fenced-expected.png differ
diff --git a/LayoutTests/platform/mac/mathml/presentation/fenced-expected.txt b/LayoutTests/platform/mac/mathml/presentation/fenced-expected.txt
index be1e944..11f7f73 100644
--- a/LayoutTests/platform/mac/mathml/presentation/fenced-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/fenced-expected.txt
@@ -1,78 +1,78 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x103
- RenderBlock {html} at (0,0) size 800x103
- RenderBody {body} at (8,16) size 784x71
- RenderBlock {p} at (0,0) size 784x71
- RenderBlock {math} at (0,0) size 170x71
- RenderBlock {mfenced} at (1,0) size 168x71
- RenderBlock {mfenced} at (1,13) size 6x58
+layer at (0,0) size 800x106
+ RenderBlock {html} at (0,0) size 800x106
+ RenderBody {body} at (8,16) size 784x74
+ RenderBlock {p} at (0,0) size 784x74
+ RenderBlock {math} at (0,0) size 170x74
+ RenderBlock {mfenced} at (1,0) size 168x74
+ RenderBlock {mfenced} at (1,16) size 6x58
RenderBlock {div} at (7,22) size 48x48 [bgcolor=#00FF00]
- RenderBlock {mfenced} at (55,35) size 5x16
+ RenderBlock {mfenced} at (55,38) size 5x16
RenderBlock {mfenced} at (0,0) size 4x16
RenderText {mfenced} at (0,0) size 4x16
text run at (0,0) width 4: ","
RenderBlock {div} at (60,22) size 48x48 [bgcolor=#00FF00]
- RenderBlock {mfenced} at (108,35) size 5x16
+ RenderBlock {mfenced} at (108,38) size 5x16
RenderBlock {mfenced} at (0,0) size 4x16
RenderText {mfenced} at (0,0) size 4x16
text run at (0,0) width 4: ","
RenderBlock {div} at (113,22) size 48x48 [bgcolor=#00FF00]
- RenderBlock {mfenced} at (161,13) size 6x58
+ RenderBlock {mfenced} at (161,16) size 6x58
RenderText {#text} at (0,0) size 0x0
-layer at (10,29) size 5x10 scrollHeight 15
+layer at (10,32) size 5x10 scrollHeight 15
RenderBlock {mfenced} at (0,0) size 5x10
-layer at (10,39) size 5x10 scrollHeight 14
+layer at (10,42) size 5x10 scrollHeight 14
RenderBlock {mfenced} at (0,10) size 5x10
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239C}"
-layer at (10,49) size 5x10 scrollHeight 14
+layer at (10,52) size 5x10 scrollHeight 14
RenderBlock {mfenced} at (0,20) size 5x10
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239C}"
-layer at (10,59) size 5x10 scrollHeight 14
+layer at (10,62) size 5x10 scrollHeight 14
RenderBlock {mfenced} at (0,30) size 5x10
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239C}"
-layer at (10,69) size 5x7 scrollHeight 14
+layer at (10,72) size 5x7 scrollHeight 14
RenderBlock {mfenced} at (0,40) size 5x7
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239C}"
-layer at (10,76) size 5x11 scrollHeight 14
+layer at (10,79) size 5x11 scrollHeight 14
RenderBlock {mfenced} at (0,47) size 5x11
-layer at (170,29) size 5x10 scrollHeight 15
+layer at (170,32) size 5x10 scrollHeight 15
RenderBlock {mfenced} at (0,0) size 5x10
-layer at (170,39) size 5x10 scrollHeight 14
+layer at (170,42) size 5x10 scrollHeight 14
RenderBlock {mfenced} at (0,10) size 5x10
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239F}"
-layer at (170,49) size 5x10 scrollHeight 14
+layer at (170,52) size 5x10 scrollHeight 14
RenderBlock {mfenced} at (0,20) size 5x10
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239F}"
-layer at (170,59) size 5x10 scrollHeight 14
+layer at (170,62) size 5x10 scrollHeight 14
RenderBlock {mfenced} at (0,30) size 5x10
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239F}"
-layer at (170,69) size 5x7 scrollHeight 14
+layer at (170,72) size 5x7 scrollHeight 14
RenderBlock {mfenced} at (0,40) size 5x7
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239F}"
-layer at (170,76) size 5x11 scrollHeight 14
+layer at (170,79) size 5x11 scrollHeight 14
RenderBlock {mfenced} at (0,47) size 5x11
-layer at (10,30) size 5x14 backgroundClip at (10,29) size 5x10 clip at (10,29) size 5x10 outlineClip at (10,29) size 5x10
+layer at (10,33) size 5x14 backgroundClip at (10,32) size 5x10 clip at (10,32) size 5x10 outlineClip at (10,32) size 5x10
RenderBlock (relative positioned) {mfenced} at (0,0) size 5x11
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239B}"
-layer at (10,73) size 5x14 backgroundClip at (10,76) size 5x11 clip at (10,76) size 5x11 outlineClip at (10,76) size 5x11
+layer at (10,76) size 5x14 backgroundClip at (10,79) size 5x11 clip at (10,79) size 5x11 outlineClip at (10,79) size 5x11
RenderBlock (relative positioned) {mfenced} at (0,0) size 5x11
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239D}"
-layer at (170,30) size 5x14 backgroundClip at (170,29) size 5x10 clip at (170,29) size 5x10 outlineClip at (170,29) size 5x10
+layer at (170,33) size 5x14 backgroundClip at (170,32) size 5x10 clip at (170,32) size 5x10 outlineClip at (170,32) size 5x10
RenderBlock (relative positioned) {mfenced} at (0,0) size 5x11
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{239E}"
-layer at (170,73) size 5x14 backgroundClip at (170,76) size 5x11 clip at (170,76) size 5x11 outlineClip at (170,76) size 5x11
+layer at (170,76) size 5x14 backgroundClip at (170,79) size 5x11 clip at (170,79) size 5x11 outlineClip at (170,79) size 5x11
RenderBlock (relative positioned) {mfenced} at (0,0) size 5x11
RenderText {mfenced} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A0}"
diff --git a/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.checksum b/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.checksum
index 292d5ea..1aacf61 100644
--- a/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.checksum
+++ b/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.checksum
@@ -1 +1 @@
-a2adcc2b842ee0418f419c8b5653b70b
\ No newline at end of file
+6f3f95aa00f5bf78aa1c8bcf95cb879d
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.png b/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.png
index 0494c0b..62a8159 100644
Binary files a/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.png and b/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.png differ
diff --git a/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt b/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt
index 983461e..abd6a99 100644
--- a/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/row-alignment-expected.txt
@@ -188,13 +188,13 @@ layer at (0,0) size 800x575
RenderBlock {p} at (0,219) size 784x80
RenderText {#text} at (0,31) size 27x18
text run at (0,31) width 27: "text "
- RenderBlock {math} at (27,0) size 74x80
+ RenderBlock {math} at (27,0) size 92x80
RenderBlock {mo} at (1,0) size 6x80
- RenderTable {mtable} at (7,5) size 60x66
- RenderTableSection (anonymous) at (0,0) size 60x66
- RenderTableRow {mtr} at (0,0) size 60x22
- RenderTableCell {mtd} at (0,0) size 20x22 [r=0 c=0 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTable {mtable} at (7,5) size 78x66
+ RenderTableSection (anonymous) at (0,0) size 78x66
+ RenderTableRow {mtr} at (0,0) size 78x22
+ RenderTableCell {mtd} at (0,0) size 26x22 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -202,8 +202,8 @@ layer at (0,0) size 800x575
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "11"
- RenderTableCell {mtd} at (20,0) size 20x22 [r=0 c=1 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (26,0) size 26x22 [r=0 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -211,8 +211,8 @@ layer at (0,0) size 800x575
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "12"
- RenderTableCell {mtd} at (40,0) size 20x22 [r=0 c=2 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (52,0) size 26x22 [r=0 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -220,9 +220,9 @@ layer at (0,0) size 800x575
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "13"
- RenderTableRow {mtr} at (0,22) size 60x22
- RenderTableCell {mtd} at (0,22) size 20x22 [r=1 c=0 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableRow {mtr} at (0,22) size 78x22
+ RenderTableCell {mtd} at (0,22) size 26x22 [r=1 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -230,8 +230,8 @@ layer at (0,0) size 800x575
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "21"
- RenderTableCell {mtd} at (20,22) size 20x22 [r=1 c=1 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (26,22) size 26x22 [r=1 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -239,8 +239,8 @@ layer at (0,0) size 800x575
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "22"
- RenderTableCell {mtd} at (40,22) size 20x22 [r=1 c=2 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (52,22) size 26x22 [r=1 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -248,9 +248,9 @@ layer at (0,0) size 800x575
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "23"
- RenderTableRow {mtr} at (0,44) size 60x22
- RenderTableCell {mtd} at (0,44) size 20x22 [r=2 c=0 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 19x22
+ RenderTableRow {mtr} at (0,44) size 78x22
+ RenderTableCell {mtd} at (0,44) size 26x22 [r=2 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 19x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -258,8 +258,8 @@ layer at (0,0) size 800x575
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (7,10) size 12x12
text run at (7,10) width 12: "31"
- RenderTableCell {mtd} at (20,44) size 20x22 [r=2 c=1 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 19x22
+ RenderTableCell {mtd} at (26,44) size 26x22 [r=2 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 19x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -267,8 +267,8 @@ layer at (0,0) size 800x575
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (7,10) size 12x12
text run at (7,10) width 12: "32"
- RenderTableCell {mtd} at (40,44) size 20x22 [r=2 c=2 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 19x22
+ RenderTableCell {mtd} at (52,44) size 26x22 [r=2 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 19x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -276,7 +276,7 @@ layer at (0,0) size 800x575
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (7,10) size 12x12
text run at (7,10) width 12: "33"
- RenderBlock {mo} at (67,0) size 6x80
+ RenderBlock {mo} at (85,0) size 6x80
RenderText {#text} at (0,0) size 0x0
layer at (36,310) size 5x10 scrollHeight 15
RenderBlock {mo} at (0,0) size 5x10
@@ -410,33 +410,33 @@ layer at (36,539) size 5x9 scrollHeight 14
text run at (0,-3) width 5: "\x{23A2}"
layer at (36,548) size 5x11 scrollHeight 14
RenderBlock {mo} at (0,69) size 5x11
-layer at (102,479) size 5x10 scrollHeight 15
+layer at (120,479) size 5x10 scrollHeight 15
RenderBlock {mo} at (0,0) size 5x10
-layer at (102,489) size 5x10 scrollHeight 14
+layer at (120,489) 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 (102,499) size 5x10 scrollHeight 14
+layer at (120,499) 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 (102,509) size 5x10 scrollHeight 14
+layer at (120,509) 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 (102,519) size 5x10 scrollHeight 14
+layer at (120,519) 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 (102,529) size 5x10 scrollHeight 14
+layer at (120,529) size 5x10 scrollHeight 14
RenderBlock {mo} at (0,50) size 5x10
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A5}"
-layer at (102,539) size 5x9 scrollHeight 14
+layer at (120,539) size 5x9 scrollHeight 14
RenderBlock {mo} at (0,60) size 5x9
RenderText {mo} at (0,-3) size 5x17
text run at (0,-3) width 5: "\x{23A5}"
-layer at (102,548) size 5x11 scrollHeight 14
+layer at (120,548) size 5x11 scrollHeight 14
RenderBlock {mo} at (0,69) size 5x11
layer at (36,311) size 5x14 backgroundClip at (36,310) size 5x10 clip at (36,310) size 5x10 outlineClip at (36,310) size 5x10
RenderBlock (relative positioned) {mo} at (0,0) size 5x11
@@ -478,11 +478,11 @@ layer at (36,545) size 5x14 backgroundClip at (36,548) size 5x11 clip at (36,548
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 (102,480) size 5x14 backgroundClip at (102,479) size 5x10 clip at (102,479) size 5x10 outlineClip at (102,479) size 5x10
+layer at (120,480) size 5x14 backgroundClip at (120,479) size 5x10 clip at (120,479) size 5x10 outlineClip at (120,479) 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 (102,545) size 5x14 backgroundClip at (102,548) size 5x11 clip at (102,548) size 5x11 outlineClip at (102,548) size 5x11
+layer at (120,545) size 5x14 backgroundClip at (120,548) size 5x11 clip at (120,548) size 5x11 outlineClip at (120,548) 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}"
diff --git a/LayoutTests/platform/mac/mathml/presentation/tables-expected.checksum b/LayoutTests/platform/mac/mathml/presentation/tables-expected.checksum
index 47d3c60..e1a98b1 100644
--- a/LayoutTests/platform/mac/mathml/presentation/tables-expected.checksum
+++ b/LayoutTests/platform/mac/mathml/presentation/tables-expected.checksum
@@ -1 +1 @@
-4bb76a66be1fb135f74d3f495ee5dd85
\ No newline at end of file
+94b971f581cef31ac427a8550b38c463
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/mathml/presentation/tables-expected.png b/LayoutTests/platform/mac/mathml/presentation/tables-expected.png
index 00d01c3..ccf339d 100644
Binary files a/LayoutTests/platform/mac/mathml/presentation/tables-expected.png and b/LayoutTests/platform/mac/mathml/presentation/tables-expected.png differ
diff --git a/LayoutTests/platform/mac/mathml/presentation/tables-expected.txt b/LayoutTests/platform/mac/mathml/presentation/tables-expected.txt
index ef18d12..e3fe263 100644
--- a/LayoutTests/platform/mac/mathml/presentation/tables-expected.txt
+++ b/LayoutTests/platform/mac/mathml/presentation/tables-expected.txt
@@ -6,12 +6,12 @@ layer at (0,0) size 800x180
RenderBlock {p} at (0,0) size 784x66
RenderText {#text} at (0,26) size 49x18
text run at (0,26) width 49: "simple: "
- RenderBlock {math} at (49,0) size 62x66
- RenderTable {mtable} at (1,0) size 60x66
- RenderTableSection (anonymous) at (0,0) size 60x66
- RenderTableRow {mtr} at (0,0) size 60x22
- RenderTableCell {mtd} at (0,0) size 20x22 [r=0 c=0 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderBlock {math} at (49,0) size 80x66
+ RenderTable {mtable} at (1,0) size 78x66
+ RenderTableSection (anonymous) at (0,0) size 78x66
+ RenderTableRow {mtr} at (0,0) size 78x22
+ RenderTableCell {mtd} at (0,0) size 26x22 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -19,8 +19,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "11"
- RenderTableCell {mtd} at (20,0) size 20x22 [r=0 c=1 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (26,0) size 26x22 [r=0 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -28,8 +28,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "12"
- RenderTableCell {mtd} at (40,0) size 20x22 [r=0 c=2 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (52,0) size 26x22 [r=0 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -37,9 +37,9 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "13"
- RenderTableRow {mtr} at (0,22) size 60x22
- RenderTableCell {mtd} at (0,22) size 20x22 [r=1 c=0 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableRow {mtr} at (0,22) size 78x22
+ RenderTableCell {mtd} at (0,22) size 26x22 [r=1 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -47,8 +47,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "21"
- RenderTableCell {mtd} at (20,22) size 20x22 [r=1 c=1 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (26,22) size 26x22 [r=1 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -56,8 +56,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "22"
- RenderTableCell {mtd} at (40,22) size 20x22 [r=1 c=2 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (52,22) size 26x22 [r=1 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -65,9 +65,9 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "23"
- RenderTableRow {mtr} at (0,44) size 60x22
- RenderTableCell {mtd} at (0,44) size 20x22 [r=2 c=0 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 19x22
+ RenderTableRow {mtr} at (0,44) size 78x22
+ RenderTableCell {mtd} at (0,44) size 26x22 [r=2 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 19x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -75,8 +75,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (7,10) size 12x12
text run at (7,10) width 12: "31"
- RenderTableCell {mtd} at (20,44) size 20x22 [r=2 c=1 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 19x22
+ RenderTableCell {mtd} at (26,44) size 26x22 [r=2 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 19x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -84,8 +84,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (7,10) size 12x12
text run at (7,10) width 12: "32"
- RenderTableCell {mtd} at (40,44) size 20x22 [r=2 c=2 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 19x22
+ RenderTableCell {mtd} at (52,44) size 26x22 [r=2 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 19x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -97,12 +97,12 @@ layer at (0,0) size 800x180
RenderBlock {p} at (0,82) size 784x66
RenderText {#text} at (0,26) size 308x18
text run at (0,26) width 308: "left, default (center) and right column alignment: "
- RenderBlock {math} at (308,0) size 198x66
- RenderTable {mtable} at (1,0) size 60x66
- RenderTableSection (anonymous) at (0,0) size 60x66
- RenderTableRow {mtr} at (0,0) size 60x22
- RenderTableCell {mtd} at (0,0) size 20x22 [r=0 c=0 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 14x22
+ RenderBlock {math} at (308,0) size 252x66
+ RenderTable {mtable} at (1,0) size 78x66
+ RenderTableSection (anonymous) at (0,0) size 78x66
+ RenderTableRow {mtr} at (0,0) size 78x22
+ RenderTableCell {mtd} at (0,0) size 26x22 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 14x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -110,8 +110,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 6x12
RenderText {#text} at (8,10) size 6x12
text run at (8,10) width 6: "1"
- RenderTableCell {mtd} at (20,0) size 20x22 [r=0 c=1 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (26,0) size 26x22 [r=0 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -119,8 +119,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "12"
- RenderTableCell {mtd} at (40,0) size 20x22 [r=0 c=2 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (52,0) size 26x22 [r=0 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -128,9 +128,9 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "13"
- RenderTableRow {mtr} at (0,22) size 60x22
- RenderTableCell {mtd} at (0,22) size 20x22 [r=1 c=0 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableRow {mtr} at (0,22) size 78x22
+ RenderTableCell {mtd} at (0,22) size 26x22 [r=1 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -138,8 +138,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "21"
- RenderTableCell {mtd} at (20,22) size 20x22 [r=1 c=1 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 14x22
+ RenderTableCell {mtd} at (26,22) size 26x22 [r=1 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 14x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -147,8 +147,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 6x12
RenderText {#text} at (8,10) size 6x12
text run at (8,10) width 6: "2"
- RenderTableCell {mtd} at (40,22) size 20x22 [r=1 c=2 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (52,22) size 26x22 [r=1 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -156,9 +156,9 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "23"
- RenderTableRow {mtr} at (0,44) size 60x22
- RenderTableCell {mtd} at (0,44) size 20x22 [r=2 c=0 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 19x22
+ RenderTableRow {mtr} at (0,44) size 78x22
+ RenderTableCell {mtd} at (0,44) size 26x22 [r=2 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 19x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -166,8 +166,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (7,10) size 12x12
text run at (7,10) width 12: "31"
- RenderTableCell {mtd} at (20,44) size 20x22 [r=2 c=1 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 19x22
+ RenderTableCell {mtd} at (26,44) size 26x22 [r=2 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 19x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -175,8 +175,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (7,10) size 12x12
text run at (7,10) width 12: "32"
- RenderTableCell {mtd} at (40,44) size 20x22 [r=2 c=2 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 13x22
+ RenderTableCell {mtd} at (52,44) size 26x22 [r=2 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 13x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -185,13 +185,13 @@ layer at (0,0) size 800x180
RenderText {#text} at (7,10) size 6x12
text run at (7,10) width 6: "3"
RenderInline {mtext} at (0,0) size 8x16
- RenderText {#text} at (61,29) size 8x16
- text run at (61,29) width 8: ", "
- RenderTable {mtable} at (69,0) size 60x66
- RenderTableSection (anonymous) at (0,0) size 60x66
- RenderTableRow {mtr} at (0,0) size 60x22
- RenderTableCell {mtd} at (0,0) size 20x22 [r=0 c=0 rs=1 cs=1]
- RenderBlock {msub} at (3,0) size 14x22
+ RenderText {#text} at (79,29) size 8x16
+ text run at (79,29) width 8: ", "
+ RenderTable {mtable} at (87,0) size 78x66
+ RenderTableSection (anonymous) at (0,0) size 78x66
+ RenderTableRow {mtr} at (0,0) size 78x22
+ RenderTableCell {mtd} at (0,0) size 26x22 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (6,0) size 14x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -199,8 +199,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 6x12
RenderText {#text} at (8,10) size 6x12
text run at (8,10) width 6: "1"
- RenderTableCell {mtd} at (20,0) size 20x22 [r=0 c=1 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (26,0) size 26x22 [r=0 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -208,8 +208,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "12"
- RenderTableCell {mtd} at (40,0) size 20x22 [r=0 c=2 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (52,0) size 26x22 [r=0 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -217,9 +217,9 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "13"
- RenderTableRow {mtr} at (0,22) size 60x22
- RenderTableCell {mtd} at (0,22) size 20x22 [r=1 c=0 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableRow {mtr} at (0,22) size 78x22
+ RenderTableCell {mtd} at (0,22) size 26x22 [r=1 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -227,8 +227,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "21"
- RenderTableCell {mtd} at (20,22) size 20x22 [r=1 c=1 rs=1 cs=1]
- RenderBlock {msub} at (3,0) size 14x22
+ RenderTableCell {mtd} at (26,22) size 26x22 [r=1 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (6,0) size 14x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -236,8 +236,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 6x12
RenderText {#text} at (8,10) size 6x12
text run at (8,10) width 6: "2"
- RenderTableCell {mtd} at (40,22) size 20x22 [r=1 c=2 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (52,22) size 26x22 [r=1 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -245,9 +245,9 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "23"
- RenderTableRow {mtr} at (0,44) size 60x22
- RenderTableCell {mtd} at (0,44) size 20x22 [r=2 c=0 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 19x22
+ RenderTableRow {mtr} at (0,44) size 78x22
+ RenderTableCell {mtd} at (0,44) size 26x22 [r=2 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 19x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -255,8 +255,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (7,10) size 12x12
text run at (7,10) width 12: "31"
- RenderTableCell {mtd} at (20,44) size 20x22 [r=2 c=1 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 19x22
+ RenderTableCell {mtd} at (26,44) size 26x22 [r=2 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 19x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -264,8 +264,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (7,10) size 12x12
text run at (7,10) width 12: "32"
- RenderTableCell {mtd} at (40,44) size 20x22 [r=2 c=2 rs=1 cs=1]
- RenderBlock {msub} at (3,0) size 13x22
+ RenderTableCell {mtd} at (52,44) size 26x22 [r=2 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (6,0) size 13x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -274,13 +274,13 @@ layer at (0,0) size 800x180
RenderText {#text} at (7,10) size 6x12
text run at (7,10) width 6: "3"
RenderInline {mtext} at (0,0) size 8x16
- RenderText {#text} at (129,29) size 8x16
- text run at (129,29) width 8: ", "
- RenderTable {mtable} at (137,0) size 60x66
- RenderTableSection (anonymous) at (0,0) size 60x66
- RenderTableRow {mtr} at (0,0) size 60x22
- RenderTableCell {mtd} at (0,0) size 20x22 [r=0 c=0 rs=1 cs=1]
- RenderBlock {msub} at (6,0) size 14x22
+ RenderText {#text} at (165,29) size 8x16
+ text run at (165,29) width 8: ", "
+ RenderTable {mtable} at (173,0) size 78x66
+ RenderTableSection (anonymous) at (0,0) size 78x66
+ RenderTableRow {mtr} at (0,0) size 78x22
+ RenderTableCell {mtd} at (0,0) size 26x22 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (9,0) size 14x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -288,8 +288,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 6x12
RenderText {#text} at (8,10) size 6x12
text run at (8,10) width 6: "1"
- RenderTableCell {mtd} at (20,0) size 20x22 [r=0 c=1 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (26,0) size 26x22 [r=0 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -297,8 +297,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "12"
- RenderTableCell {mtd} at (40,0) size 20x22 [r=0 c=2 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (52,0) size 26x22 [r=0 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -306,9 +306,9 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "13"
- RenderTableRow {mtr} at (0,22) size 60x22
- RenderTableCell {mtd} at (0,22) size 20x22 [r=1 c=0 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableRow {mtr} at (0,22) size 78x22
+ RenderTableCell {mtd} at (0,22) size 26x22 [r=1 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -316,8 +316,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "21"
- RenderTableCell {mtd} at (20,22) size 20x22 [r=1 c=1 rs=1 cs=1]
- RenderBlock {msub} at (6,0) size 14x22
+ RenderTableCell {mtd} at (26,22) size 26x22 [r=1 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (9,0) size 14x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -325,8 +325,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 6x12
RenderText {#text} at (8,10) size 6x12
text run at (8,10) width 6: "2"
- RenderTableCell {mtd} at (40,22) size 20x22 [r=1 c=2 rs=1 cs=1]
- RenderBlock {msub} at (0,0) size 20x22
+ RenderTableCell {mtd} at (52,22) size 26x22 [r=1 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (3,0) size 20x22
RenderBlock {msub} at (0,0) size 8x19
RenderInline {mi} at (0,0) size 8x16
RenderText {#text} at (0,3) size 8x16
@@ -334,9 +334,9 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (8,10) size 12x12
text run at (8,10) width 12: "23"
- RenderTableRow {mtr} at (0,44) size 60x22
- RenderTableCell {mtd} at (0,44) size 20x22 [r=2 c=0 rs=1 cs=1]
- RenderBlock {msub} at (1,0) size 19x22
+ RenderTableRow {mtr} at (0,44) size 78x22
+ RenderTableCell {mtd} at (0,44) size 26x22 [r=2 c=0 rs=1 cs=1]
+ RenderBlock {msub} at (4,0) size 19x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -344,8 +344,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (7,10) size 12x12
text run at (7,10) width 12: "31"
- RenderTableCell {mtd} at (20,44) size 20x22 [r=2 c=1 rs=1 cs=1]
- RenderBlock {msub} at (1,0) size 19x22
+ RenderTableCell {mtd} at (26,44) size 26x22 [r=2 c=1 rs=1 cs=1]
+ RenderBlock {msub} at (4,0) size 19x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
@@ -353,8 +353,8 @@ layer at (0,0) size 800x180
RenderInline {mn} at (0,0) size 12x12
RenderText {#text} at (7,10) size 12x12
text run at (7,10) width 12: "32"
- RenderTableCell {mtd} at (40,44) size 20x22 [r=2 c=2 rs=1 cs=1]
- RenderBlock {msub} at (7,0) size 13x22
+ RenderTableCell {mtd} at (52,44) size 26x22 [r=2 c=2 rs=1 cs=1]
+ RenderBlock {msub} at (10,0) size 13x22
RenderBlock {msub} at (0,0) size 7x19
RenderInline {mi} at (0,0) size 7x16
RenderText {#text} at (0,3) size 7x16
diff --git a/LayoutTests/platform/mac/mathml/xHeight-expected.checksum b/LayoutTests/platform/mac/mathml/xHeight-expected.checksum
new file mode 100644
index 0000000..3fcbfe5
--- /dev/null
+++ b/LayoutTests/platform/mac/mathml/xHeight-expected.checksum
@@ -0,0 +1 @@
+fa4f440bbf5008dbdf9b8313b0e0f8f2
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/mathml/xHeight-expected.png b/LayoutTests/platform/mac/mathml/xHeight-expected.png
new file mode 100644
index 0000000..4fb4ab2
Binary files /dev/null and b/LayoutTests/platform/mac/mathml/xHeight-expected.png differ
diff --git a/LayoutTests/platform/mac/mathml/xHeight-expected.txt b/LayoutTests/platform/mac/mathml/xHeight-expected.txt
new file mode 100644
index 0000000..ec5f81a
--- /dev/null
+++ b/LayoutTests/platform/mac/mathml/xHeight-expected.txt
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x53
+ RenderBlock {html} at (0,0) size 800x53
+ RenderBody {body} at (8,16) size 784x21
+ RenderBlock {p} at (0,0) size 784x21
+ RenderText {#text} at (0,0) size 301x18
+ text run at (0,0) width 301: "The green square should be vertically centered: "
+ RenderBlock {math} at (301,0) size 29x21
+ RenderInline {mi} at (0,0) size 7x16
+ RenderText {#text} at (1,3) size 7x16
+ text run at (1,3) width 7: "x"
+ RenderBlock {div} at (8,1) size 20x20 [bgcolor=#00FF00]
+ RenderText {#text} at (0,0) size 0x0
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6ee4b18..d8b8158 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-22 François Sausset <sausset at gmail.com>
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Fix wrong xHeight() value for Apple Symbols font.
+ https://bugs.webkit.org/show_bug.cgi?id=41535
+
+ Test: mathml/xHeight.xhtml
+
+ * platform/graphics/mac/SimpleFontDataMac.mm:
+ (WebCore::SimpleFontData::platformInit):
+
2010-10-22 Nikolas Zimmermann <nzimmermann at rim.com>
Reviewed by Dirk Schulze.
diff --git a/WebCore/platform/graphics/mac/SimpleFontDataMac.mm b/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
index c916825..fd57630 100644
--- a/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
+++ b/WebCore/platform/graphics/mac/SimpleFontDataMac.mm
@@ -277,6 +277,11 @@ void SimpleFontData::platformInit()
#else
m_xHeight = m_platformData.font() ? [m_platformData.font() xHeight] : 0;
#endif
+ // CGFontGetXHeight() returns a wrong value for "Apple Symbols" font (a float close to 0, but not strictly 0).
+ // The following code makes a guess for m_xHeight in that case.
+ // The int cast is a workaround for the "almost" zero value returned by CGFontGetXHeight().
+ if (!static_cast<int>(m_xHeight) && fAscent)
+ m_xHeight = 2 * fAscent / 3;
}
}
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list