[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198
zimmermann at webkit.org
zimmermann at webkit.org
Sun Feb 20 23:38:25 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 9c4aceb142de048cd186c2d2d5aaa2d6e6b5948d
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Jan 22 15:14:17 2011 +0000
2011-01-22 Nikolas Zimmermann <nzimmermann at rim.com>
Not reviewed.
REGRESSION: Vertical line metrics incorrect
https://bugs.webkit.org/show_bug.cgi?id=52960
Rebaselined several text dumps from the bots, after the FontMetrics change.
All show 1px diffs, but are progressions, since the lineSpacing calculation has been improved.
Mac still has the old results - as it depends on a rounding trick at the moment.
* platform/gtk/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt:
* platform/gtk/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt:
* platform/gtk/svg/text/text-hkern-expected.txt:
* platform/gtk/svg/text/text-hkern-on-vertical-text-expected.txt:
* platform/gtk/svg/text/text-vkern-expected.txt:
* platform/gtk/svg/text/text-vkern-on-horizontal-text-expected.txt:
* platform/mac/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt:
* platform/mac/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/animate-elem-03-t-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/animate-elem-24-t-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/animate-elem-36-t-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/animate-elem-40-t-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/fonts-desc-02-t-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/fonts-elem-05-t-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/fonts-elem-06-t-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/masking-mask-01-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/render-groups-01-b-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/render-groups-03-t-expected.txt:
* platform/mac/svg/W3C-SVG-1.1/text-text-04-t-expected.txt:
* platform/mac/svg/batik/text/xmlSpace-expected.txt:
* platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt:
* platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
* platform/mac/svg/custom/svg-fonts-with-no-element-reference-expected.txt:
* platform/mac/svg/text/text-hkern-expected.txt:
* platform/mac/svg/text/text-hkern-on-vertical-text-expected.txt:
* platform/mac/svg/text/text-text-04-t-expected.txt:
* platform/mac/svg/text/text-vkern-expected.txt:
* platform/mac/svg/text/text-vkern-on-horizontal-text-expected.txt:
* platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.txt:
* platform/qt/css2.1/t1507-c526-font-sz-02-b-a-expected.txt:
* platform/qt/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt:
* platform/qt/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt:
* platform/qt/svg/W3C-SVG-1.1/fonts-glyph-02-t-expected.txt:
* platform/qt/svg/text/text-hkern-expected.txt:
* platform/qt/svg/text/text-hkern-on-vertical-text-expected.txt:
* platform/qt/svg/text/text-vkern-expected.txt:
* platform/qt/svg/text/text-vkern-on-horizontal-text-expected.txt:
* platform/qt/svg/transforms/text-with-mask-with-svg-transform-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76449 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt b/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt
index 2fc3232..63dcfb6 100644
--- a/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt
+++ b/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt
@@ -58,8 +58,8 @@ layer at (0,0) size 480x360
chunk 1 text run 4 at (182.83,340.00) startOffset 12 endOffset 13 width 8.90: "."
chunk 1 text run 5 at (188.50,340.00) startOffset 13 endOffset 16 width 44.48: "1 $"
RenderSVGPath {rect} at (0,0) size 480x360 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
- RenderSVGContainer {g} at (0,0) size 480x23
+ RenderSVGContainer {g} at (0,0) size 480x22
RenderSVGPath {rect} at (0,0) size 480x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FF0000]}] [x=1.00] [y=1.00] [width=478.00] [height=20.00]
- RenderSVGText {text} at (206,1) size 68x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 68x21
+ RenderSVGText {text} at (206,2) size 68x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 68x19
chunk 1 (middle anchor) text run 1 at (206.67,18.00) startOffset 0 endOffset 5 width 66.66: "DRAFT"
diff --git a/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt b/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt
index a602833..5991873 100644
--- a/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt
+++ b/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt
@@ -37,8 +37,8 @@ layer at (0,0) size 480x360
chunk 1 text run 4 at (182.83,340.00) startOffset 12 endOffset 13 width 8.90: "."
chunk 1 text run 5 at (188.50,340.00) startOffset 13 endOffset 16 width 44.48: "1 $"
RenderSVGPath {rect} at (0,0) size 480x360 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
- RenderSVGContainer {g} at (0,0) size 480x23
+ RenderSVGContainer {g} at (0,0) size 480x22
RenderSVGPath {rect} at (0,0) size 480x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FF0000]}] [x=1.00] [y=1.00] [width=478.00] [height=20.00]
- RenderSVGText {text} at (206,1) size 68x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 68x21
+ RenderSVGText {text} at (206,2) size 68x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 68x19
chunk 1 (middle anchor) text run 1 at (206.67,18.00) startOffset 0 endOffset 5 width 66.66: "DRAFT"
diff --git a/LayoutTests/platform/gtk/svg/text/text-hkern-expected.txt b/LayoutTests/platform/gtk/svg/text/text-hkern-expected.txt
index b674367..572b29a 100644
--- a/LayoutTests/platform/gtk/svg/text/text-hkern-expected.txt
+++ b/LayoutTests/platform/gtk/svg/text/text-hkern-expected.txt
@@ -1,27 +1,27 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (4,29) size 142x115
+ RenderSVGRoot {svg} at (4,31) size 142x111
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGPath {path} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [data="M 2.5 70 L 200 70"]
- RenderSVGText {text} at (0,-8) size 70x10 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 70x10
+ RenderSVGText {text} at (0,-7) size 70x8 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 70x8
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
chunk 1 text run 2 at (17.50,0.00) startOffset 1 endOffset 2 width 5.00: "2"
chunk 1 text run 3 at (37.50,0.00) startOffset 2 endOffset 3 width 7.50: "3"
chunk 1 text run 4 at (60.00,0.00) startOffset 3 endOffset 4 width 10.00: "4"
- RenderSVGText {text} at (0,-8) size 40x10 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 3x10
+ RenderSVGText {text} at (0,-7) size 40x8 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 3x8
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
- RenderSVGTSpan {tspan} at (0,0) size 28x10
- RenderSVGInlineText {#text} at (2,0) size 28x10
+ RenderSVGTSpan {tspan} at (0,0) size 28x8
+ RenderSVGInlineText {#text} at (2,0) size 28x8
chunk 1 text run 1 at (2.50,0.00) startOffset 0 endOffset 1 width 5.00: "2"
chunk 1 text run 2 at (22.50,0.00) startOffset 1 endOffset 2 width 7.50: "3"
- RenderSVGInlineText {#text} at (30,0) size 10x10
+ RenderSVGInlineText {#text} at (30,0) size 10x8
chunk 1 text run 1 at (30.00,0.00) startOffset 0 endOffset 1 width 10.00: "4"
- RenderSVGText {text} at (2,62) size 71x10 contains 1 chunk(s)
- RenderSVGTextPath {textPath} at (0,0) size 71x10
- RenderSVGInlineText {#text} at (0,0) size 71x10
+ RenderSVGText {text} at (2,63) size 71x8 contains 1 chunk(s)
+ RenderSVGTextPath {textPath} at (0,0) size 71x8
+ RenderSVGInlineText {#text} at (0,0) size 71x8
chunk 1 text run 1 at (3.75,70.00) startOffset 0 endOffset 1 width 2.50: "1"
chunk 1 text run 2 at (22.50,70.00) startOffset 1 endOffset 2 width 5.00: "2"
chunk 1 text run 3 at (43.75,70.00) startOffset 2 endOffset 3 width 7.50: "3"
diff --git a/LayoutTests/platform/gtk/svg/text/text-hkern-on-vertical-text-expected.txt b/LayoutTests/platform/gtk/svg/text/text-hkern-on-vertical-text-expected.txt
index 3fbe5bd..0658c5d 100644
--- a/LayoutTests/platform/gtk/svg/text/text-hkern-on-vertical-text-expected.txt
+++ b/LayoutTests/platform/gtk/svg/text/text-hkern-on-vertical-text-expected.txt
@@ -1,12 +1,12 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (10,90) size 20x80
+ RenderSVGRoot {svg} at (10,90) size 20x64
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGContainer {g} at (10,90) size 20x80
- RenderSVGText {text} at (-5,0) size 10x40 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 10x40
- chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 10.00: "1"
- chunk 1 (vertical) text run 2 at (-3.00,10.00) startOffset 1 endOffset 2 height 10.00: "2"
- chunk 1 (vertical) text run 3 at (-3.00,20.00) startOffset 2 endOffset 3 height 10.00: "3"
- chunk 1 (vertical) text run 4 at (-3.00,30.00) startOffset 3 endOffset 4 height 10.00: "4"
+ RenderSVGContainer {g} at (10,90) size 20x64
+ RenderSVGText {text} at (-5,0) size 10x32 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 10x32
+ chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 8.00: "1"
+ chunk 1 (vertical) text run 2 at (-3.00,8.00) startOffset 1 endOffset 2 height 8.00: "2"
+ chunk 1 (vertical) text run 3 at (-3.00,16.00) startOffset 2 endOffset 3 height 8.00: "3"
+ chunk 1 (vertical) text run 4 at (-3.00,24.00) startOffset 3 endOffset 4 height 8.00: "4"
diff --git a/LayoutTests/platform/gtk/svg/text/text-vkern-expected.txt b/LayoutTests/platform/gtk/svg/text/text-vkern-expected.txt
index a82ea7e..505d4c4 100644
--- a/LayoutTests/platform/gtk/svg/text/text-vkern-expected.txt
+++ b/LayoutTests/platform/gtk/svg/text/text-vkern-expected.txt
@@ -1,25 +1,25 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (5,29) size 75x177
+ RenderSVGRoot {svg} at (5,31) size 75x159
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGPath {path} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [data="M 2.5 90 L 200 90"]
- RenderSVGText {text} at (0,-8) size 25x10 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 25x10
+ RenderSVGText {text} at (0,-7) size 25x8 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 25x8
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 4 width 25.00: "1234"
- RenderSVGContainer {g} at (10,90) size 70x116
- RenderSVGText {text} at (-5,0) size 10x58 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 10x58
- chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 10.00: "1"
- chunk 1 (vertical) text run 2 at (-3.00,16.00) startOffset 1 endOffset 2 height 10.00: "2"
- chunk 1 (vertical) text run 3 at (-3.00,32.00) startOffset 2 endOffset 3 height 10.00: "3"
- chunk 1 (vertical) text run 4 at (-3.00,48.00) startOffset 3 endOffset 4 height 10.00: "4"
- RenderSVGText {text} at (-5,0) size 10x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (3,0) size 4x10
- chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 10.00: "1"
- RenderSVGTSpan {tspan} at (0,0) size 8x26
- RenderSVGInlineText {#text} at (1,10) size 8x26
- chunk 1 (vertical) text run 1 at (-3.00,10.00) startOffset 0 endOffset 1 height 10.00: "2"
- chunk 1 (vertical) text run 2 at (-3.00,26.00) startOffset 1 endOffset 2 height 10.00: "3"
- RenderSVGInlineText {#text} at (0,36) size 10x10
- chunk 1 (vertical) text run 1 at (-3.00,36.00) startOffset 0 endOffset 1 height 10.00: "4"
+ RenderSVGContainer {g} at (10,90) size 70x100
+ RenderSVGText {text} at (-5,0) size 10x50 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 10x50
+ chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 8.00: "1"
+ chunk 1 (vertical) text run 2 at (-3.00,14.00) startOffset 1 endOffset 2 height 8.00: "2"
+ chunk 1 (vertical) text run 3 at (-3.00,28.00) startOffset 2 endOffset 3 height 8.00: "3"
+ chunk 1 (vertical) text run 4 at (-3.00,42.00) startOffset 3 endOffset 4 height 8.00: "4"
+ RenderSVGText {text} at (-5,0) size 10x38 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (3,0) size 4x8
+ chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 8.00: "1"
+ RenderSVGTSpan {tspan} at (0,0) size 8x22
+ RenderSVGInlineText {#text} at (1,8) size 8x22
+ chunk 1 (vertical) text run 1 at (-3.00,8.00) startOffset 0 endOffset 1 height 8.00: "2"
+ chunk 1 (vertical) text run 2 at (-3.00,22.00) startOffset 1 endOffset 2 height 8.00: "3"
+ RenderSVGInlineText {#text} at (0,30) size 10x8
+ chunk 1 (vertical) text run 1 at (-3.00,30.00) startOffset 0 endOffset 1 height 8.00: "4"
diff --git a/LayoutTests/platform/gtk/svg/text/text-vkern-on-horizontal-text-expected.txt b/LayoutTests/platform/gtk/svg/text/text-vkern-on-horizontal-text-expected.txt
index 436a780..5a3be5d 100644
--- a/LayoutTests/platform/gtk/svg/text/text-vkern-on-horizontal-text-expected.txt
+++ b/LayoutTests/platform/gtk/svg/text/text-vkern-on-horizontal-text-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (5,29) size 50x20
+ RenderSVGRoot {svg} at (5,31) size 50x16
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGText {text} at (0,-8) size 25x10 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 25x10
+ RenderSVGText {text} at (0,-7) size 25x8 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 25x8
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 4 width 25.00: "1234"
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt
index 2fc3232..63dcfb6 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt
@@ -58,8 +58,8 @@ layer at (0,0) size 480x360
chunk 1 text run 4 at (182.83,340.00) startOffset 12 endOffset 13 width 8.90: "."
chunk 1 text run 5 at (188.50,340.00) startOffset 13 endOffset 16 width 44.48: "1 $"
RenderSVGPath {rect} at (0,0) size 480x360 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
- RenderSVGContainer {g} at (0,0) size 480x23
+ RenderSVGContainer {g} at (0,0) size 480x22
RenderSVGPath {rect} at (0,0) size 480x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FF0000]}] [x=1.00] [y=1.00] [width=478.00] [height=20.00]
- RenderSVGText {text} at (206,1) size 68x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 68x21
+ RenderSVGText {text} at (206,2) size 68x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 68x19
chunk 1 (middle anchor) text run 1 at (206.67,18.00) startOffset 0 endOffset 5 width 66.66: "DRAFT"
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt
index a602833..5991873 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt
@@ -37,8 +37,8 @@ layer at (0,0) size 480x360
chunk 1 text run 4 at (182.83,340.00) startOffset 12 endOffset 13 width 8.90: "."
chunk 1 text run 5 at (188.50,340.00) startOffset 13 endOffset 16 width 44.48: "1 $"
RenderSVGPath {rect} at (0,0) size 480x360 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
- RenderSVGContainer {g} at (0,0) size 480x23
+ RenderSVGContainer {g} at (0,0) size 480x22
RenderSVGPath {rect} at (0,0) size 480x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FF0000]}] [x=1.00] [y=1.00] [width=478.00] [height=20.00]
- RenderSVGText {text} at (206,1) size 68x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 68x21
+ RenderSVGText {text} at (206,2) size 68x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 68x19
chunk 1 (middle anchor) text run 1 at (206.67,18.00) startOffset 0 endOffset 5 width 66.66: "DRAFT"
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-03-t-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-03-t-expected.txt
index 8e10a88..0b76e2f 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-03-t-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-03-t-expected.txt
@@ -3,17 +3,17 @@ layer at (0,0) size 480x360
layer at (0,0) size 480x360
RenderSVGRoot {svg} at (0,0) size 480x360
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGContainer {g} at (20,46) size 322x212
- RenderSVGContainer {g} at (20,46) size 322x212
- RenderSVGContainer {g} at (20,46) size 322x212
- RenderSVGText {text} at (20,46) size 215x42 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 215x42
+ RenderSVGContainer {g} at (20,47) size 322x210
+ RenderSVGContainer {g} at (20,47) size 322x210
+ RenderSVGContainer {g} at (20,47) size 322x210
+ RenderSVGText {text} at (20,47) size 215x40 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 215x40
chunk 1 text run 1 at (20.00,80.00) startOffset 0 endOffset 10 width 214.44: "Sample 123"
- RenderSVGText {text} at (20,104) size 322x63 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 322x63
+ RenderSVGText {text} at (20,105) size 322x61 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 322x61
chunk 1 text run 1 at (20.00,155.00) startOffset 0 endOffset 10 width 321.66: "Sample 123"
- RenderSVGText {text} at (20,216) size 215x42 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 215x42
+ RenderSVGText {text} at (20,217) size 215x40 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 215x40
chunk 1 text run 1 at (20.00,250.00) startOffset 0 endOffset 10 width 214.44: "Sample 123"
RenderSVGText {text} at (10,304) size 284x46 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 284x46
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-24-t-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-24-t-expected.txt
index d32b2ec..0423b17 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-24-t-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-24-t-expected.txt
@@ -3,7 +3,7 @@ layer at (0,0) size 480x360
layer at (0,0) size 480x360
RenderSVGRoot {svg} at (0,0) size 480x360
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGContainer {g} at (42,38) size 289x239
+ RenderSVGContainer {g} at (43,39) size 288x238
RenderSVGContainer {g} at (70,92) size 149x133
RenderSVGText {text} at (70,92) size 149x23 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 149x23
@@ -14,19 +14,19 @@ layer at (0,0) size 480x360
RenderSVGText {text} at (100,202) size 80x23 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 80x23
chunk 1 text run 1 at (100.00,220.00) startOffset 0 endOffset 10 width 80.00: "Text at 9s"
- RenderSVGContainer {g} at (42,38) size 289x239
- RenderSVGText {text} at (0,-15) size 77x17 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 77x17
+ RenderSVGContainer {g} at (43,39) size 288x238
+ RenderSVGText {text} at (0,-14) size 77x16 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 77x16
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 11 width 76.84: "It's alive!"
- RenderSVGText {text} at (0,-30) size 154x35 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 154x35
+ RenderSVGText {text} at (0,-29) size 154x34 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 154x34
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 11 width 153.68: "It's alive!"
- RenderSVGText {text} at (100,225) size 231x52 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 231x52
+ RenderSVGText {text} at (100,226) size 231x51 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 231x51
chunk 1 text run 1 at (100.00,270.00) startOffset 0 endOffset 11 width 230.52: "It's alive!"
- RenderSVGContainer {g} at (42,38) size 76x54 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,90.00)}]
- RenderSVGText {text} at (0,-15) size 77x17 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 77x17
+ RenderSVGContainer {g} at (43,39) size 75x53 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,90.00)}]
+ RenderSVGText {text} at (0,-14) size 77x16 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 77x16
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 11 width 76.84: "It's alive!"
RenderSVGInlineText {#text} at (0,0) size 0x0
RenderSVGInlineText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-36-t-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-36-t-expected.txt
index 7473d61..078e46a 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-36-t-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-36-t-expected.txt
@@ -87,10 +87,10 @@ layer at (0,0) size 480x360
RenderSVGText {text} at (-13,46) size 26x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 26x18
chunk 1 (middle anchor) text run 1 at (-12.50,60.00) startOffset 0 endOffset 3 width 25.00: "<a>"
- RenderSVGContainer {g} at (145,185) size 70x99 [transform={m=((1.00,0.00)(0.00,1.00)) t=(180.00,220.00)}]
+ RenderSVGContainer {g} at (145,186) size 70x98 [transform={m=((1.00,0.00)(0.00,1.00)) t=(180.00,220.00)}]
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGText {text} at (-34,-34) size 68x42 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 68x42
+ RenderSVGText {text} at (-34,-33) size 68x40 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 68x40
chunk 1 (middle anchor) text run 1 at (-33.70,0.00) startOffset 0 endOffset 3 width 67.40: "123"
RenderSVGText {text} at (-21,46) size 42x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 42x18
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-40-t-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-40-t-expected.txt
index 9262913..b43950f 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-40-t-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/animate-elem-40-t-expected.txt
@@ -5,7 +5,7 @@ layer at (0,0) size 480x360
RenderSVGText {text} at (144,11) size 192x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 192x18
chunk 1 (middle anchor) text run 1 at (144.50,25.00) startOffset 0 endOffset 29 width 191.00: "<animate> of x/y/width/height"
- RenderSVGContainer {g} at (8,40) size 466x249
+ RenderSVGContainer {g} at (8,41) size 466x248
RenderSVGContainer {g} at (18,54) size 84x100 [transform={m=((1.00,0.00)(0.00,1.00)) t=(60.00,90.00)}]
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGPath {rect} at (57,87) size 6x6 [fill={[type=SOLID] [color=#000000]}] [x=-3.00] [y=-3.00] [width=6.00] [height=6.00]
@@ -88,10 +88,10 @@ layer at (0,0) size 480x360
RenderSVGText {text} at (-43,46) size 86x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 86x18
chunk 1 (middle anchor) text run 1 at (-42.50,60.00) startOffset 0 endOffset 13 width 85.00: "x/y on <rect>"
- RenderSVGContainer {g} at (377,40) size 97x114 [transform={m=((1.00,0.00)(0.00,1.00)) t=(420.00,90.00)}]
+ RenderSVGContainer {g} at (377,41) size 97x113 [transform={m=((1.00,0.00)(0.00,1.00)) t=(420.00,90.00)}]
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGText {text} at (-15,-49) size 68x42 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 68x42
+ RenderSVGText {text} at (-15,-48) size 68x40 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 68x40
chunk 1 text run 1 at (-15.00,-15.00) startOffset 0 endOffset 3 width 67.40: "123"
RenderSVGContainer {use} at (401,71) size 38x38
RenderSVGContainer {g} at (401,71) size 38x38
@@ -107,7 +107,7 @@ layer at (0,0) size 480x360
RenderSVGText {text} at (-43,46) size 86x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 86x18
chunk 1 (middle anchor) text run 1 at (-42.50,60.00) startOffset 0 endOffset 13 width 85.00: "x/y on <rect>"
- RenderSVGContainer {g} at (8,160) size 104x114 [transform={m=((1.00,0.00)(0.00,1.00)) t=(60.00,210.00)}]
+ RenderSVGContainer {g} at (8,161) size 104x113 [transform={m=((1.00,0.00)(0.00,1.00)) t=(60.00,210.00)}]
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGContainer {g} at (41,191) size 38x38
RenderSVGContainer {use} at (41,191) size 8x8
@@ -122,8 +122,8 @@ layer at (0,0) size 480x360
RenderSVGContainer {use} at (41,221) size 8x8
RenderSVGContainer {g} at (41,221) size 8x8 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-15.00,15.00)}]
RenderSVGPath {rect} at (41,221) size 8x8 [stroke={[type=SOLID] [color=#FFB400]}] [fill={[type=SOLID] [color=#E6E6E6]}] [x=-3.00] [y=-3.00] [width=6.00] [height=6.00]
- RenderSVGText {text} at (-35,-49) size 64x42 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 64x42
+ RenderSVGText {text} at (-35,-48) size 64x40 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 64x40
chunk 1 text run 1 at (-35.00,-15.00) startOffset 0 endOffset 1 width 22.32: "1"
chunk 1 text run 1 at (5.00,-15.00) startOffset 0 endOffset 1 width 23.40: "2"
RenderSVGContainer {use} at (21,191) size 38x38
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-desc-02-t-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-desc-02-t-expected.txt
index 167d681..63cead7 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-desc-02-t-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-desc-02-t-expected.txt
@@ -2,35 +2,35 @@ layer at (0,0) size 480x360
RenderView at (0,0) size 480x360
layer at (0,0) size 480x360
RenderSVGRoot {svg} at (0,0) size 480x360
- RenderSVGContainer {g} at (50,25) size 165x183
+ RenderSVGContainer {g} at (50,26) size 165x182
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGContainer {g} at (50,25) size 165x183
- RenderSVGText {text} at (50,25) size 15x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 15x31
+ RenderSVGContainer {g} at (50,26) size 165x182
+ RenderSVGText {text} at (50,26) size 15x29 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 15x29
chunk 1 text run 1 at (50.00,50.00) startOffset 0 endOffset 1 width 15.00: "a"
- RenderSVGText {text} at (100,25) size 15x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 15x31
+ RenderSVGText {text} at (100,26) size 15x29 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 15x29
chunk 1 text run 1 at (100.00,50.00) startOffset 0 endOffset 1 width 15.00: "a"
- RenderSVGText {text} at (50,75) size 15x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 15x31
+ RenderSVGText {text} at (50,76) size 15x29 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 15x29
chunk 1 text run 1 at (50.00,100.00) startOffset 0 endOffset 1 width 15.00: "a"
- RenderSVGText {text} at (100,75) size 15x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 15x31
+ RenderSVGText {text} at (100,76) size 15x29 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 15x29
chunk 1 text run 1 at (100.00,100.00) startOffset 0 endOffset 1 width 15.00: "a"
- RenderSVGText {text} at (50,125) size 15x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 15x31
+ RenderSVGText {text} at (50,126) size 15x29 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 15x29
chunk 1 text run 1 at (50.00,150.00) startOffset 0 endOffset 1 width 15.00: "a"
- RenderSVGText {text} at (100,125) size 15x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 15x31
+ RenderSVGText {text} at (100,126) size 15x29 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 15x29
chunk 1 text run 1 at (100.00,150.00) startOffset 0 endOffset 1 width 15.00: "a"
- RenderSVGText {text} at (150,125) size 15x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 15x31
+ RenderSVGText {text} at (150,126) size 15x29 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 15x29
chunk 1 text run 1 at (150.00,150.00) startOffset 0 endOffset 1 width 15.00: "a"
- RenderSVGText {text} at (200,125) size 15x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 15x31
+ RenderSVGText {text} at (200,126) size 15x29 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 15x29
chunk 1 text run 1 at (200.00,150.00) startOffset 0 endOffset 1 width 15.00: "a"
- RenderSVGText {text} at (50,175) size 15x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 15x31
+ RenderSVGText {text} at (50,176) size 15x29 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 15x29
chunk 1 text run 1 at (50.00,200.00) startOffset 0 endOffset 1 width 15.00: "a"
RenderSVGText {text} at (100,172) size 15x36 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 15x36
@@ -38,8 +38,8 @@ layer at (0,0) size 480x360
RenderSVGText {text} at (150,172) size 13x36 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 13x36
chunk 1 text run 1 at (150.00,200.00) startOffset 0 endOffset 1 width 13.00: "a"
- RenderSVGText {text} at (200,175) size 15x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 15x31
+ RenderSVGText {text} at (200,176) size 15x29 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 15x29
chunk 1 text run 1 at (200.00,200.00) startOffset 0 endOffset 1 width 15.00: "a"
RenderSVGText {text} at (10,304) size 264x46 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 264x46
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-elem-05-t-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-elem-05-t-expected.txt
index 9845590..e9786b0 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-elem-05-t-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-elem-05-t-expected.txt
@@ -45,8 +45,8 @@ layer at (0,0) size 480x360
RenderSVGContainer {g} at (391,80) size 8x44
RenderSVGPath {line} at (394,80) size 2x40 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-40.00]
RenderSVGPath {rect} at (391,116) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (240,-31) size 180x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 180x31
+ RenderSVGText {text} at (240,-30) size 180x30 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 180x30
chunk 1 text run 1 at (240.00,0.00) startOffset 0 endOffset 4 width 180.00: "1234"
RenderSVGContainer {g} at (20,140) size 420x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,60.00)}]
RenderSVGText {text} at (0,-13) size 109x17 contains 1 chunk(s)
@@ -80,8 +80,8 @@ layer at (0,0) size 480x360
RenderSVGPath {line} at (409,140) size 2x40 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=15.00] [y1=0.00] [x2=15.00] [y2=-40.00]
RenderSVGPath {line} at (395,179) size 15x2 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=0.00] [x2=15.00] [y2=0.00]
RenderSVGPath {rect} at (391,176) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (240,-31) size 180x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 180x31
+ RenderSVGText {text} at (240,-30) size 180x30 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 180x30
chunk 1 text run 1 at (240.00,0.00) startOffset 0 endOffset 4 width 180.00: "1234"
RenderSVGContainer {g} at (20,200) size 420x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,120.00)}]
RenderSVGText {text} at (0,-13) size 171x17 contains 1 chunk(s)
@@ -115,8 +115,8 @@ layer at (0,0) size 480x360
RenderSVGPath {line} at (424,200) size 2x40 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=30.00] [y1=0.00] [x2=30.00] [y2=-40.00]
RenderSVGPath {line} at (395,239) size 30x2 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=0.00] [x2=30.00] [y2=0.00]
RenderSVGPath {rect} at (391,236) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (240,-31) size 180x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 180x31
+ RenderSVGText {text} at (240,-30) size 180x30 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 180x30
chunk 1 text run 1 at (240.00,0.00) startOffset 0 endOffset 4 width 180.00: "1234"
RenderSVGText {text} at (10,304) size 264x46 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 264x46
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-elem-06-t-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-elem-06-t-expected.txt
index 83a98c9..e8feaaf 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-elem-06-t-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/fonts-elem-06-t-expected.txt
@@ -10,8 +10,8 @@ layer at (0,0) size 480x360
RenderSVGContainer {g} at (0,0) size 4x4
RenderSVGPath {line} at (0,0) size 0x0 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-20.00]
RenderSVGPath {rect} at (0,0) size 4x4 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGContainer {g} at (20,89) size 420x115 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,120.00)}]
- RenderSVGContainer {g} at (20,89) size 300x35
+ RenderSVGContainer {g} at (20,90) size 420x114 [transform={m=((1.00,0.00)(0.00,1.00)) t=(20.00,120.00)}]
+ RenderSVGContainer {g} at (20,90) size 300x34
RenderSVGText {text} at (0,-13) size 102x17 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 102x17
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 16 width 102.00: "horiz-adv-x=1000"
@@ -25,10 +25,10 @@ layer at (0,0) size 480x360
RenderSVGContainer {g} at (286,100) size 8x24
RenderSVGPath {line} at (289,100) size 2x20 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-20.00]
RenderSVGPath {rect} at (286,116) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (240,-31) size 60x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 60x31
+ RenderSVGText {text} at (240,-30) size 60x30 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 60x30
chunk 1 text run 1 at (240.00,0.00) startOffset 0 endOffset 2 width 60.00: "12"
- RenderSVGContainer {g} at (20,129) size 360x35 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,40.00)}]
+ RenderSVGContainer {g} at (20,130) size 360x34 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,40.00)}]
RenderSVGText {text} at (0,-13) size 102x17 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 102x17
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 16 width 102.00: "horiz-adv-x=2000"
@@ -42,10 +42,10 @@ layer at (0,0) size 480x360
RenderSVGContainer {g} at (316,140) size 8x24
RenderSVGPath {line} at (319,140) size 2x20 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-20.00]
RenderSVGPath {rect} at (316,156) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (240,-31) size 120x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 120x31
+ RenderSVGText {text} at (240,-30) size 120x30 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 120x30
chunk 1 text run 1 at (240.00,0.00) startOffset 0 endOffset 2 width 120.00: "12"
- RenderSVGContainer {g} at (20,169) size 420x35 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,80.00)}]
+ RenderSVGContainer {g} at (20,170) size 420x34 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,80.00)}]
RenderSVGText {text} at (0,-13) size 171x17 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 171x17
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 28 width 171.00: "horiz-adv-x=1000 but ignored"
@@ -59,8 +59,8 @@ layer at (0,0) size 480x360
RenderSVGContainer {g} at (346,180) size 8x24
RenderSVGPath {line} at (349,180) size 2x20 [stroke={[type=SOLID] [color=#FF0000]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=0.00] [x2=0.00] [y2=-20.00]
RenderSVGPath {rect} at (346,196) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (240,-31) size 180x31 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 180x31
+ RenderSVGText {text} at (240,-30) size 180x30 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 180x30
chunk 1 text run 1 at (240.00,0.00) startOffset 0 endOffset 2 width 180.00: "12"
RenderSVGText {text} at (10,304) size 284x46 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 284x46
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/masking-mask-01-b-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/masking-mask-01-b-expected.txt
index 79614c4..7e799ab 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/masking-mask-01-b-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/masking-mask-01-b-expected.txt
@@ -38,9 +38,9 @@ layer at (0,0) size 480x360
RenderSVGPath {rect} at (60,225) size 200x25 [fill={[type=SOLID] [color=#FFFFFF] [opacity=0.20]}] [x=60.00] [y=225.00] [width=200.00] [height=25.00]
RenderSVGPath {rect} at (60,250) size 200x25 [fill={[type=SOLID] [color=#FFFFFF]}] [x=60.00] [y=250.00] [width=200.00] [height=25.00]
RenderSVGPath {rect} at (60,275) size 200x25 [fill={[type=SOLID] [color=#FFFFFF] [opacity=0.70]}] [x=60.00] [y=275.00] [width=200.00] [height=25.00]
- RenderSVGText {text} at (60,198) size 126x115 contains 1 chunk(s)
+ RenderSVGText {text} at (60,198) size 126x114 contains 1 chunk(s)
[masker="mask3"] RenderSVGResourceMasker {mask} at (60,200) size 200x100
- RenderSVGInlineText {#text} at (0,0) size 126x115
+ RenderSVGInlineText {#text} at (0,0) size 126x114
[masker="mask3"] RenderSVGResourceMasker {mask} at (60,200) size 200x100
chunk 1 text run 1 at (60.00,280.00) startOffset 0 endOffset 2 width 80.96: "SV"
chunk 1 text run 2 at (145.36,280.00) startOffset 2 endOffset 3 width 40.37: "G"
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-groups-01-b-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-groups-01-b-expected.txt
index b836e3c..0b25e33 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-groups-01-b-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-groups-01-b-expected.txt
@@ -16,8 +16,8 @@ layer at (0,0) size 480x360
RenderSVGPath {line} at (435,18) size 30x297 [stroke={[type=SOLID] [color=#FFFFFF] [stroke width=15.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=250.00] [y1=10.00] [x2=250.00] [y2=175.00]
RenderSVGPath {rect} at (34,16) size 418x283 [stroke={[type=SOLID] [color=#000000]}] [x=20.00] [y=10.00] [width=230.00] [height=155.00]
RenderSVGContainer {g} at (54,0) size 382x279 [opacity=0.50]
- RenderSVGText {text} at (30,0) size 138x126 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 138x126
+ RenderSVGText {text} at (30,0) size 138x125 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 138x125
chunk 1 text run 1 at (30.00,90.00) startOffset 0 endOffset 2 width 88.32: "SV"
chunk 1 text run 2 at (123.12,90.00) startOffset 2 endOffset 3 width 44.04: "G"
RenderSVGPath {rect} at (126,99) size 234x126 [fill={[type=SOLID] [color=#820032]}] [x=70.00] [y=55.00] [width=130.00] [height=70.00]
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-groups-03-t-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-groups-03-t-expected.txt
index 3c81ab8..cd70aea 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-groups-03-t-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/render-groups-03-t-expected.txt
@@ -15,8 +15,8 @@ layer at (0,0) size 480x360
RenderSVGPath {line} at (381,18) size 30x297 [stroke={[type=SOLID] [color=#FFFFFF] [stroke width=15.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=220.00] [y1=10.00] [x2=220.00] [y2=175.00]
RenderSVGPath {line} at (435,18) size 30x297 [stroke={[type=SOLID] [color=#FFFFFF] [stroke width=15.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=250.00] [y1=10.00] [x2=250.00] [y2=175.00]
RenderSVGPath {rect} at (34,16) size 418x283 [stroke={[type=SOLID] [color=#000000]}] [x=20.00] [y=10.00] [width=230.00] [height=155.00]
- RenderSVGText {text} at (30,0) size 138x126 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 138x126
+ RenderSVGText {text} at (30,0) size 138x125 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 138x125
chunk 1 text run 1 at (30.00,90.00) startOffset 0 endOffset 2 width 88.32: "SV"
chunk 1 text run 2 at (123.12,90.00) startOffset 2 endOffset 3 width 44.04: "G"
RenderSVGPath {rect} at (126,99) size 234x126 [fill={[type=SOLID] [color=#820032]}] [x=70.00] [y=55.00] [width=130.00] [height=70.00]
diff --git a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-text-04-t-expected.txt b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-text-04-t-expected.txt
index e6b354e..2692c7e 100644
--- a/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-text-04-t-expected.txt
+++ b/LayoutTests/platform/mac/svg/W3C-SVG-1.1/text-text-04-t-expected.txt
@@ -3,12 +3,12 @@ layer at (0,0) size 480x360
layer at (0,0) size 480x360
RenderSVGRoot {svg} at (0,0) size 480x360
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGContainer {g} at (36,19) size 418x291
- RenderSVGContainer {g} at (36,19) size 154x26 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,40.00)}]
+ RenderSVGContainer {g} at (36,20) size 418x289
+ RenderSVGContainer {g} at (36,20) size 154x24 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,40.00)}]
RenderSVGText {text} at (-94,-14) size 64x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 64x18
chunk 1 (end anchor) text run 1 at (-94.00,0.00) startOffset 0 endOffset 9 width 64.00: "Reference"
- RenderSVGContainer {g} at (126,19) size 64x26
+ RenderSVGContainer {g} at (126,20) size 64x24
RenderSVGContainer {use} at (126,36) size 8x8
RenderSVGContainer {g} at (126,36) size 8x8
RenderSVGPath {rect} at (126,36) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
@@ -21,12 +21,12 @@ layer at (0,0) size 480x360
RenderSVGContainer {use} at (171,36) size 8x8
RenderSVGContainer {g} at (171,36) size 8x8 [transform={m=((1.00,0.00)(0.00,1.00)) t=(45.00,0.00)}]
RenderSVGPath {rect} at (171,36) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (0,-21) size 60x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 60x26
+ RenderSVGText {text} at (0,-20) size 60x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 60x24
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 4 width 60.00: "1234"
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGPath {rect} at (0,0) size 4x4 [fill={[type=SOLID] [color=#000000]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGContainer {g} at (73,59) size 152x26 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,80.00)}]
+ RenderSVGContainer {g} at (73,60) size 152x24 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,80.00)}]
RenderSVGText {text} at (-57,-14) size 27x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 27x18
chunk 1 (end anchor) text run 1 at (-57.00,0.00) startOffset 0 endOffset 5 width 27.00: "x all"
@@ -45,13 +45,13 @@ layer at (0,0) size 480x360
RenderSVGContainer {use} at (206,76) size 8x8
RenderSVGContainer {g} at (206,76) size 8x8 [transform={m=((1.00,0.00)(0.00,1.00)) t=(80.00,0.00)}]
RenderSVGPath {rect} at (206,76) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-21) size 75x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 75x26
+ RenderSVGText {text} at (20,-20) size 75x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 75x24
chunk 1 text run 1 at (20.00,0.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,0.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,0.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (80.00,0.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (56,99) size 178x26 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,120.00)}]
+ RenderSVGContainer {g} at (56,100) size 178x24 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,120.00)}]
RenderSVGText {text} at (-74,-14) size 44x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 44x18
chunk 1 (end anchor) text run 1 at (-74.00,0.00) startOffset 0 endOffset 6 width 44.00: "x more"
@@ -73,13 +73,13 @@ layer at (0,0) size 480x360
RenderSVGContainer {use} at (226,116) size 8x8
RenderSVGContainer {g} at (226,116) size 8x8 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,0.00)}]
RenderSVGPath {rect} at (226,116) size 8x8 [fill={[type=SOLID] [color=#FF0000]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-21) size 75x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 75x26
+ RenderSVGText {text} at (20,-20) size 75x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 75x24
chunk 1 text run 1 at (20.00,0.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,0.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,0.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (80.00,0.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (52,139) size 168x26 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,160.00)}]
+ RenderSVGContainer {g} at (52,140) size 168x24 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,160.00)}]
RenderSVGText {text} at (-78,-14) size 48x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 48x18
chunk 1 (end anchor) text run 1 at (-78.00,0.00) startOffset 0 endOffset 7 width 48.00: "x fewer"
@@ -98,12 +98,12 @@ layer at (0,0) size 480x360
RenderSVGContainer {use} at (201,156) size 8x8
RenderSVGContainer {g} at (201,156) size 8x8 [transform={m=((1.00,0.00)(0.00,1.00)) t=(75.00,0.00)}]
RenderSVGPath {rect} at (201,156) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-21) size 70x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 70x26
+ RenderSVGText {text} at (20,-20) size 70x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 70x24
chunk 1 text run 1 at (20.00,0.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,0.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,0.00) startOffset 0 endOffset 2 width 30.00: "34"
- RenderSVGContainer {g} at (73,169) size 117x46 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,200.00)}]
+ RenderSVGContainer {g} at (73,170) size 117x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,200.00)}]
RenderSVGText {text} at (-57,-14) size 27x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 27x18
chunk 1 (end anchor) text run 1 at (-57.00,0.00) startOffset 0 endOffset 5 width 27.00: "y all"
@@ -119,13 +119,13 @@ layer at (0,0) size 480x360
RenderSVGContainer {use} at (171,206) size 8x8
RenderSVGContainer {g} at (171,206) size 8x8 [transform={m=((1.00,0.00)(0.00,1.00)) t=(45.00,10.00)}]
RenderSVGPath {rect} at (171,206) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (0,-31) size 60x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 60x46
+ RenderSVGText {text} at (0,-30) size 60x44 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 60x44
chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (15.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (30.00,5.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (45.00,10.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (56,219) size 134x46 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,250.00)}]
+ RenderSVGContainer {g} at (56,220) size 134x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,250.00)}]
RenderSVGText {text} at (-74,-14) size 44x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 44x18
chunk 1 (end anchor) text run 1 at (-74.00,0.00) startOffset 0 endOffset 6 width 44.00: "y more"
@@ -141,13 +141,13 @@ layer at (0,0) size 480x360
RenderSVGContainer {use} at (171,256) size 8x8
RenderSVGContainer {g} at (171,256) size 8x8 [transform={m=((1.00,0.00)(0.00,1.00)) t=(45.00,10.00)}]
RenderSVGPath {rect} at (171,256) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (0,-31) size 60x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 60x46
+ RenderSVGText {text} at (0,-30) size 60x44 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 60x44
chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (15.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (30.00,5.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (45.00,10.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (52,269) size 138x41 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,300.00)}]
+ RenderSVGContainer {g} at (52,270) size 138x39 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,300.00)}]
RenderSVGText {text} at (-78,-14) size 48x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 48x18
chunk 1 (end anchor) text run 1 at (-78.00,0.00) startOffset 0 endOffset 7 width 48.00: "y fewer"
@@ -163,13 +163,13 @@ layer at (0,0) size 480x360
RenderSVGContainer {use} at (171,301) size 8x8
RenderSVGContainer {g} at (171,301) size 8x8 [transform={m=((1.00,0.00)(0.00,1.00)) t=(45.00,5.00)}]
RenderSVGPath {rect} at (171,301) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (0,-31) size 60x41 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 60x41
+ RenderSVGText {text} at (0,-30) size 60x39 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 60x39
chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (15.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (30.00,5.00) startOffset 0 endOffset 2 width 30.00: "34"
- RenderSVGContainer {g} at (241,49) size 213x206 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
- RenderSVGContainer {g} at (281,49) size 164x46 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,80.00)}]
+ RenderSVGContainer {g} at (241,50) size 213x204 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
+ RenderSVGContainer {g} at (281,50) size 164x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,80.00)}]
RenderSVGText {text} at (-69,-14) size 39x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 39x18
chunk 1 (end anchor) text run 1 at (-69.00,0.00) startOffset 0 endOffset 7 width 39.00: "x/y all"
@@ -188,13 +188,13 @@ layer at (0,0) size 480x360
RenderSVGContainer {use} at (426,86) size 8x8
RenderSVGContainer {g} at (426,86) size 8x8 [transform={m=((1.00,0.00)(0.00,1.00)) t=(80.00,10.00)}]
RenderSVGPath {rect} at (426,86) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-31) size 75x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 75x46
+ RenderSVGText {text} at (20,-30) size 75x44 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 75x44
chunk 1 text run 1 at (20.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,5.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (80.00,10.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (264,89) size 190x55 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,120.00)}]
+ RenderSVGContainer {g} at (264,90) size 190x54 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,120.00)}]
RenderSVGText {text} at (-86,-14) size 56x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 56x18
chunk 1 (end anchor) text run 1 at (-86.00,0.00) startOffset 0 endOffset 8 width 56.00: "x/y more"
@@ -216,13 +216,13 @@ layer at (0,0) size 480x360
RenderSVGContainer {use} at (446,136) size 8x8
RenderSVGContainer {g} at (446,136) size 8x8 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,20.00)}]
RenderSVGPath {rect} at (446,136) size 8x8 [fill={[type=SOLID] [color=#FF0000]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-31) size 75x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 75x46
+ RenderSVGText {text} at (20,-30) size 75x44 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 75x44
chunk 1 text run 1 at (20.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,5.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (80.00,10.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (260,129) size 180x41 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,160.00)}]
+ RenderSVGContainer {g} at (260,130) size 180x39 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,160.00)}]
RenderSVGText {text} at (-90,-14) size 60x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 60x18
chunk 1 (end anchor) text run 1 at (-90.00,0.00) startOffset 0 endOffset 9 width 60.00: "x/y fewer"
@@ -241,12 +241,12 @@ layer at (0,0) size 480x360
RenderSVGContainer {use} at (421,161) size 8x8
RenderSVGContainer {g} at (421,161) size 8x8 [transform={m=((1.00,0.00)(0.00,1.00)) t=(75.00,5.00)}]
RenderSVGPath {rect} at (421,161) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-31) size 70x41 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 70x41
+ RenderSVGText {text} at (20,-30) size 70x39 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 70x39
chunk 1 text run 1 at (20.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,5.00) startOffset 0 endOffset 2 width 30.00: "34"
- RenderSVGContainer {g} at (241,169) size 204x41 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,200.00)}]
+ RenderSVGContainer {g} at (241,170) size 204x39 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,200.00)}]
RenderSVGText {text} at (-109,-14) size 79x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 79x18
chunk 1 (end anchor) text run 1 at (-109.00,0.00) startOffset 0 endOffset 13 width 79.00: "x all y fewer"
@@ -265,13 +265,13 @@ layer at (0,0) size 480x360
RenderSVGContainer {use} at (426,201) size 8x8
RenderSVGContainer {g} at (426,201) size 8x8 [transform={m=((1.00,0.00)(0.00,1.00)) t=(80.00,5.00)}]
RenderSVGPath {rect} at (426,201) size 8x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-31) size 75x41 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 75x41
+ RenderSVGText {text} at (20,-30) size 75x39 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 75x39
chunk 1 text run 1 at (20.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,5.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (80.00,5.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (241,209) size 199x46 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,240.00)}]
+ RenderSVGContainer {g} at (241,210) size 199x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,240.00)}]
RenderSVGText {text} at (-109,-14) size 79x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 79x18
chunk 1 (end anchor) text run 1 at (-109.00,0.00) startOffset 0 endOffset 13 width 79.00: "x fewer y all"
@@ -290,8 +290,8 @@ layer at (0,0) size 480x360
RenderSVGContainer {use} at (423,246) size 9x8
RenderSVGContainer {g} at (423,246) size 9x8 [transform={m=((1.00,0.00)(0.00,1.00)) t=(77.52,10.00)}]
RenderSVGPath {rect} at (423,246) size 9x8 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-31) size 70x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 70x46
+ RenderSVGText {text} at (20,-30) size 70x44 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 70x44
chunk 1 text run 1 at (20.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,5.00) startOffset 0 endOffset 1 width 15.00: "3"
diff --git a/LayoutTests/platform/mac/svg/batik/text/xmlSpace-expected.txt b/LayoutTests/platform/mac/svg/batik/text/xmlSpace-expected.txt
index 34ae0c4..0f2f6ca 100644
--- a/LayoutTests/platform/mac/svg/batik/text/xmlSpace-expected.txt
+++ b/LayoutTests/platform/mac/svg/batik/text/xmlSpace-expected.txt
@@ -1,27 +1,27 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 450x500
- RenderSVGRoot {svg} at (10,26) size 435x354
+ RenderSVGRoot {svg} at (10,26) size 435x353
RenderSVGText {text} at (130,26) size 190x17 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 190x17
chunk 1 (middle anchor) text run 1 at (130.00,40.00) startOffset 0 endOffset 26 width 190.00: "Test of xml:space handling"
- RenderSVGContainer {g} at (10,54) size 435x326
- RenderSVGText {text} at (10,54) size 36x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 36x26
+ RenderSVGContainer {g} at (10,55) size 435x324
+ RenderSVGText {text} at (10,55) size 36x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 36x24
chunk 1 text run 1 at (10.00,75.00) startOffset 0 endOffset 2 width 24.00: "X "
chunk 1 text run 1 at (34.00,75.00) startOffset 0 endOffset 1 width 12.00: "X"
RenderSVGText {text} at (120,68) size 85x9 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 85x9
chunk 1 text run 1 at (120.00,75.00) startOffset 0 endOffset 17 width 85.00: "no xml:space attr"
- RenderSVGText {text} at (10,79) size 36x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 36x26
+ RenderSVGText {text} at (10,80) size 36x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 36x24
chunk 1 text run 1 at (10.00,100.00) startOffset 0 endOffset 2 width 24.00: "X "
chunk 1 text run 1 at (34.00,100.00) startOffset 0 endOffset 1 width 12.00: "X"
RenderSVGText {text} at (120,93) size 95x9 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 95x9
chunk 1 text run 1 at (120.00,100.00) startOffset 0 endOffset 19 width 95.00: "xml:space=\"default\""
- RenderSVGText {text} at (10,129) size 96x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 96x26
+ RenderSVGText {text} at (10,130) size 96x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 96x24
chunk 1 text run 1 at (10.00,150.00) startOffset 0 endOffset 8 width 96.00: " X X "
RenderSVGTSpan {tspan} at (0,0) size 0x0
RenderSVGText {text} at (120,133) size 95x19 contains 1 chunk(s)
@@ -30,8 +30,8 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 95x10
RenderSVGInlineText {#text} at (0,9) size 95x10
chunk 1 text run 1 at (120.00,149.60) startOffset 0 endOffset 19 width 95.00: "xml:space=\"default\""
- RenderSVGText {text} at (10,154) size 72x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 72x26
+ RenderSVGText {text} at (10,155) size 72x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 72x24
chunk 1 text run 1 at (10.00,175.00) startOffset 0 endOffset 6 width 72.00: " X X"
RenderSVGTSpan {tspan} at (0,0) size 0x0
RenderSVGInlineText {#text} at (0,0) size 0x0
@@ -41,21 +41,21 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 95x10
RenderSVGInlineText {#text} at (0,9) size 95x10
chunk 1 text run 1 at (120.00,174.60) startOffset 0 endOffset 19 width 95.00: "xml:space=\"default\""
- RenderSVGText {text} at (10,179) size 84x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 84x26
+ RenderSVGText {text} at (10,180) size 84x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 84x24
chunk 1 text run 1 at (10.00,200.00) startOffset 0 endOffset 7 width 84.00: " X X "
RenderSVGTSpan {tspan} at (0,0) size 0x0
- RenderSVGInlineText {#text} at (-10,-179) size 0x0
+ RenderSVGInlineText {#text} at (-10,-180) size 0x0
RenderSVGText {text} at (120,183) size 95x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 50x9
chunk 1 text run 1 at (120.00,190.00) startOffset 0 endOffset 10 width 50.00: "tspan end "
RenderSVGTSpan {tspan} at (0,0) size 95x10
RenderSVGInlineText {#text} at (0,9) size 95x10
chunk 1 text run 1 at (120.00,199.60) startOffset 0 endOffset 19 width 95.00: "xml:space=\"default\""
- RenderSVGText {text} at (10,204) size 84x26 contains 1 chunk(s)
+ RenderSVGText {text} at (10,205) size 84x24 contains 1 chunk(s)
RenderSVGTSpan {tspan} at (0,0) size 0x0
RenderSVGInlineText {#text} at (0,0) size 0x0
- RenderSVGInlineText {#text} at (0,0) size 84x26
+ RenderSVGInlineText {#text} at (0,0) size 84x24
chunk 1 text run 1 at (10.00,225.00) startOffset 0 endOffset 7 width 84.00: " X X "
RenderSVGText {text} at (120,208) size 95x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 60x9
@@ -63,12 +63,12 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 95x10
RenderSVGInlineText {#text} at (0,9) size 95x10
chunk 1 text run 1 at (120.00,224.60) startOffset 0 endOffset 19 width 95.00: "xml:space=\"default\""
- RenderSVGText {text} at (10,229) size 84x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 12x26
+ RenderSVGText {text} at (10,230) size 84x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 12x24
chunk 1 text run 1 at (10.00,250.00) startOffset 0 endOffset 1 width 12.00: " "
RenderSVGTSpan {tspan} at (0,0) size 0x0
- RenderSVGInlineText {#text} at (-10,-229) size 0x0
- RenderSVGInlineText {#text} at (12,0) size 72x26
+ RenderSVGInlineText {#text} at (-10,-230) size 0x0
+ RenderSVGInlineText {#text} at (12,0) size 72x24
chunk 1 text run 1 at (22.00,250.00) startOffset 0 endOffset 6 width 72.00: "X X "
RenderSVGText {text} at (120,233) size 95x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 85x9
@@ -76,13 +76,13 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 95x10
RenderSVGInlineText {#text} at (0,9) size 95x10
chunk 1 text run 1 at (120.00,249.60) startOffset 0 endOffset 19 width 95.00: "xml:space=\"default\""
- RenderSVGText {text} at (10,254) size 96x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 36x26
+ RenderSVGText {text} at (10,255) size 96x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 36x24
chunk 1 text run 1 at (10.00,275.00) startOffset 0 endOffset 3 width 36.00: " X"
- RenderSVGTSpan {tspan} at (0,0) size 12x26
- RenderSVGInlineText {#text} at (36,0) size 12x26
+ RenderSVGTSpan {tspan} at (0,0) size 12x24
+ RenderSVGInlineText {#text} at (36,0) size 12x24
chunk 1 text run 1 at (46.00,275.00) startOffset 0 endOffset 1 width 12.00: " "
- RenderSVGInlineText {#text} at (48,0) size 48x26
+ RenderSVGInlineText {#text} at (48,0) size 48x24
chunk 1 text run 1 at (58.00,275.00) startOffset 0 endOffset 4 width 48.00: " X "
RenderSVGText {text} at (120,258) size 95x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 95x9
@@ -90,12 +90,12 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 95x10
RenderSVGInlineText {#text} at (0,9) size 95x10
chunk 1 text run 1 at (120.00,274.60) startOffset 0 endOffset 19 width 95.00: "xml:space=\"default\""
- RenderSVGText {text} at (10,279) size 84x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 48x26
+ RenderSVGText {text} at (10,280) size 84x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 48x24
chunk 1 text run 1 at (10.00,300.00) startOffset 0 endOffset 4 width 48.00: " X "
RenderSVGTSpan {tspan} at (0,0) size 0x0
- RenderSVGInlineText {#text} at (-10,-279) size 0x0
- RenderSVGInlineText {#text} at (48,0) size 36x26
+ RenderSVGInlineText {#text} at (-10,-280) size 0x0
+ RenderSVGInlineText {#text} at (48,0) size 36x24
chunk 1 text run 1 at (58.00,300.00) startOffset 0 endOffset 3 width 36.00: "X "
RenderSVGText {text} at (120,283) size 95x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 85x9
@@ -103,10 +103,10 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 95x10
RenderSVGInlineText {#text} at (0,9) size 95x10
chunk 1 text run 1 at (120.00,299.60) startOffset 0 endOffset 19 width 95.00: "xml:space=\"default\""
- RenderSVGText {text} at (10,304) size 96x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 12x26
+ RenderSVGText {text} at (10,305) size 96x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 12x24
chunk 1 text run 1 at (10.00,325.00) startOffset 0 endOffset 1 width 12.00: " "
- RenderSVGInlineText {#text} at (12,0) size 84x26
+ RenderSVGInlineText {#text} at (12,0) size 84x24
chunk 1 text run 1 at (22.00,325.00) startOffset 0 endOffset 7 width 84.00: " X X "
RenderSVGText {text} at (120,308) size 80x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 80x9
@@ -114,10 +114,10 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 25x10
RenderSVGInlineText {#text} at (0,9) size 25x10
chunk 1 text run 1 at (120.00,324.60) startOffset 0 endOffset 5 width 25.00: "start"
- RenderSVGText {text} at (10,329) size 96x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 48x26
+ RenderSVGText {text} at (10,330) size 96x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 48x24
chunk 1 text run 1 at (10.00,350.00) startOffset 0 endOffset 4 width 48.00: " X "
- RenderSVGInlineText {#text} at (48,0) size 48x26
+ RenderSVGInlineText {#text} at (48,0) size 48x24
chunk 1 text run 1 at (58.00,350.00) startOffset 0 endOffset 4 width 48.00: " X "
RenderSVGText {text} at (120,333) size 80x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 80x9
@@ -125,10 +125,10 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 30x10
RenderSVGInlineText {#text} at (0,9) size 30x10
chunk 1 text run 1 at (120.00,349.60) startOffset 0 endOffset 6 width 30.00: "middle"
- RenderSVGText {text} at (10,354) size 96x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 84x26
+ RenderSVGText {text} at (10,355) size 96x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 84x24
chunk 1 text run 1 at (10.00,375.00) startOffset 0 endOffset 7 width 84.00: " X X "
- RenderSVGInlineText {#text} at (84,0) size 12x26
+ RenderSVGInlineText {#text} at (84,0) size 12x24
chunk 1 text run 1 at (94.00,375.00) startOffset 0 endOffset 1 width 12.00: " "
RenderSVGText {text} at (120,358) size 80x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 80x9
@@ -136,14 +136,14 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 15x10
RenderSVGInlineText {#text} at (0,9) size 15x10
chunk 1 text run 1 at (120.00,374.60) startOffset 0 endOffset 3 width 15.00: "end"
- RenderSVGText {text} at (235,79) size 96x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 96x26
+ RenderSVGText {text} at (235,80) size 96x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 96x24
chunk 1 text run 1 at (235.00,100.00) startOffset 0 endOffset 8 width 96.00: " X X "
RenderSVGText {text} at (345,93) size 100x9 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 100x9
chunk 1 text run 1 at (345.00,100.00) startOffset 0 endOffset 20 width 100.00: "xml:space=\"preserve\""
- RenderSVGText {text} at (235,129) size 36x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 36x26
+ RenderSVGText {text} at (235,130) size 36x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 36x24
chunk 1 text run 1 at (235.00,150.00) startOffset 0 endOffset 2 width 24.00: "X "
chunk 1 text run 1 at (259.00,150.00) startOffset 0 endOffset 1 width 12.00: "X"
RenderSVGTSpan {tspan} at (0,0) size 0x0
@@ -153,12 +153,12 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 100x10
RenderSVGInlineText {#text} at (0,9) size 100x10
chunk 1 text run 1 at (345.00,149.60) startOffset 0 endOffset 20 width 100.00: "xml:space=\"preserve\""
- RenderSVGText {text} at (235,154) size 60x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 36x26
+ RenderSVGText {text} at (235,155) size 60x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 36x24
chunk 1 text run 1 at (235.00,175.00) startOffset 0 endOffset 2 width 24.00: "X "
chunk 1 text run 1 at (259.00,175.00) startOffset 0 endOffset 1 width 12.00: "X"
- RenderSVGTSpan {tspan} at (0,0) size 24x26
- RenderSVGInlineText {#text} at (36,0) size 24x26
+ RenderSVGTSpan {tspan} at (0,0) size 24x24
+ RenderSVGInlineText {#text} at (36,0) size 24x24
chunk 1 text run 1 at (271.00,175.00) startOffset 0 endOffset 2 width 24.00: " "
RenderSVGText {text} at (345,158) size 100x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 75x9
@@ -166,12 +166,12 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 100x10
RenderSVGInlineText {#text} at (0,9) size 100x10
chunk 1 text run 1 at (345.00,174.60) startOffset 0 endOffset 20 width 100.00: "xml:space=\"preserve\""
- RenderSVGText {text} at (235,179) size 60x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 48x26
+ RenderSVGText {text} at (235,180) size 60x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 48x24
chunk 1 text run 1 at (235.00,200.00) startOffset 0 endOffset 2 width 24.00: "X "
chunk 1 text run 1 at (259.00,200.00) startOffset 0 endOffset 2 width 24.00: "X "
- RenderSVGTSpan {tspan} at (0,0) size 12x26
- RenderSVGInlineText {#text} at (48,0) size 12x26
+ RenderSVGTSpan {tspan} at (0,0) size 12x24
+ RenderSVGInlineText {#text} at (48,0) size 12x24
chunk 1 text run 1 at (283.00,200.00) startOffset 0 endOffset 1 width 12.00: " "
RenderSVGText {text} at (345,183) size 100x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 50x9
@@ -179,11 +179,11 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 100x10
RenderSVGInlineText {#text} at (0,9) size 100x10
chunk 1 text run 1 at (345.00,199.60) startOffset 0 endOffset 20 width 100.00: "xml:space=\"preserve\""
- RenderSVGText {text} at (235,204) size 48x26 contains 1 chunk(s)
- RenderSVGTSpan {tspan} at (0,0) size 12x26
- RenderSVGInlineText {#text} at (0,0) size 12x26
+ RenderSVGText {text} at (235,205) size 48x24 contains 1 chunk(s)
+ RenderSVGTSpan {tspan} at (0,0) size 12x24
+ RenderSVGInlineText {#text} at (0,0) size 12x24
chunk 1 text run 1 at (235.00,225.00) startOffset 0 endOffset 1 width 12.00: " "
- RenderSVGInlineText {#text} at (12,0) size 36x26
+ RenderSVGInlineText {#text} at (12,0) size 36x24
chunk 1 text run 1 at (247.00,225.00) startOffset 1 endOffset 3 width 24.00: "X "
chunk 1 text run 1 at (271.00,225.00) startOffset 0 endOffset 1 width 12.00: "X"
RenderSVGText {text} at (345,208) size 100x19 contains 1 chunk(s)
@@ -192,11 +192,11 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 100x10
RenderSVGInlineText {#text} at (0,9) size 100x10
chunk 1 text run 1 at (345.00,224.60) startOffset 0 endOffset 20 width 100.00: "xml:space=\"preserve\""
- RenderSVGText {text} at (235,229) size 48x26 contains 1 chunk(s)
- RenderSVGTSpan {tspan} at (0,0) size 12x26
- RenderSVGInlineText {#text} at (0,0) size 12x26
+ RenderSVGText {text} at (235,230) size 48x24 contains 1 chunk(s)
+ RenderSVGTSpan {tspan} at (0,0) size 12x24
+ RenderSVGInlineText {#text} at (0,0) size 12x24
chunk 1 text run 1 at (235.00,250.00) startOffset 0 endOffset 1 width 12.00: " "
- RenderSVGInlineText {#text} at (12,0) size 36x26
+ RenderSVGInlineText {#text} at (12,0) size 36x24
chunk 1 text run 1 at (247.00,250.00) startOffset 0 endOffset 2 width 24.00: "X "
chunk 1 text run 1 at (271.00,250.00) startOffset 0 endOffset 1 width 12.00: "X"
RenderSVGText {text} at (345,233) size 100x19 contains 1 chunk(s)
@@ -205,13 +205,13 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 100x10
RenderSVGInlineText {#text} at (0,9) size 100x10
chunk 1 text run 1 at (345.00,249.60) startOffset 0 endOffset 20 width 100.00: "xml:space=\"preserve\""
- RenderSVGText {text} at (235,254) size 36x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 12x26
+ RenderSVGText {text} at (235,255) size 36x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 12x24
chunk 1 text run 1 at (235.00,275.00) startOffset 0 endOffset 1 width 12.00: "X"
- RenderSVGTSpan {tspan} at (0,0) size 12x26
- RenderSVGInlineText {#text} at (12,0) size 12x26
+ RenderSVGTSpan {tspan} at (0,0) size 12x24
+ RenderSVGInlineText {#text} at (12,0) size 12x24
chunk 1 text run 1 at (247.00,275.00) startOffset 0 endOffset 1 width 12.00: " "
- RenderSVGInlineText {#text} at (24,0) size 12x26
+ RenderSVGInlineText {#text} at (24,0) size 12x24
chunk 1 text run 1 at (259.00,275.00) startOffset 1 endOffset 2 width 12.00: "X"
RenderSVGText {text} at (345,258) size 100x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 95x9
@@ -219,13 +219,13 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 100x10
RenderSVGInlineText {#text} at (0,9) size 100x10
chunk 1 text run 1 at (345.00,274.60) startOffset 0 endOffset 20 width 100.00: "xml:space=\"preserve\""
- RenderSVGText {text} at (235,279) size 48x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 24x26
+ RenderSVGText {text} at (235,280) size 48x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 24x24
chunk 1 text run 1 at (235.00,300.00) startOffset 0 endOffset 2 width 24.00: "X "
- RenderSVGTSpan {tspan} at (0,0) size 12x26
- RenderSVGInlineText {#text} at (24,0) size 12x26
+ RenderSVGTSpan {tspan} at (0,0) size 12x24
+ RenderSVGInlineText {#text} at (24,0) size 12x24
chunk 1 text run 1 at (259.00,300.00) startOffset 0 endOffset 1 width 12.00: " "
- RenderSVGInlineText {#text} at (36,0) size 12x26
+ RenderSVGInlineText {#text} at (36,0) size 12x24
chunk 1 text run 1 at (271.00,300.00) startOffset 0 endOffset 1 width 12.00: "X"
RenderSVGText {text} at (345,283) size 100x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 85x9
@@ -233,8 +233,8 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 100x10
RenderSVGInlineText {#text} at (0,9) size 100x10
chunk 1 text run 1 at (345.00,299.60) startOffset 0 endOffset 20 width 100.00: "xml:space=\"preserve\""
- RenderSVGText {text} at (235,304) size 36x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 36x26
+ RenderSVGText {text} at (235,305) size 36x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 36x24
chunk 1 text run 1 at (235.00,325.00) startOffset 0 endOffset 2 width 24.00: "X "
chunk 1 text run 1 at (259.00,325.00) startOffset 0 endOffset 1 width 12.00: "X"
RenderSVGText {text} at (345,308) size 80x19 contains 1 chunk(s)
@@ -243,10 +243,10 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 25x10
RenderSVGInlineText {#text} at (0,9) size 25x10
chunk 1 text run 1 at (345.00,324.60) startOffset 0 endOffset 5 width 25.00: "start"
- RenderSVGText {text} at (235,329) size 36x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 24x26
+ RenderSVGText {text} at (235,330) size 36x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 24x24
chunk 1 text run 1 at (235.00,350.00) startOffset 0 endOffset 2 width 24.00: "X "
- RenderSVGInlineText {#text} at (24,0) size 12x26
+ RenderSVGInlineText {#text} at (24,0) size 12x24
chunk 1 text run 1 at (259.00,350.00) startOffset 0 endOffset 1 width 12.00: "X"
RenderSVGText {text} at (345,333) size 80x19 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 80x9
@@ -254,8 +254,8 @@ layer at (0,0) size 450x500
RenderSVGTSpan {tspan} at (0,0) size 30x10
RenderSVGInlineText {#text} at (0,9) size 30x10
chunk 1 text run 1 at (345.00,349.60) startOffset 0 endOffset 6 width 30.00: "middle"
- RenderSVGText {text} at (236,354) size 36x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 36x26
+ RenderSVGText {text} at (236,355) size 36x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 36x24
chunk 1 text run 1 at (236.00,375.00) startOffset 0 endOffset 2 width 24.00: "X "
chunk 1 text run 1 at (260.00,375.00) startOffset 0 endOffset 1 width 12.00: "X"
RenderSVGInlineText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
index 44ead63..17f2ec6 100644
--- a/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt
@@ -73,8 +73,8 @@ layer at (0,0) size 785x1014
RenderSVGPath {line} at (435,18) size 30x297 [stroke={[type=SOLID] [color=#FFFFFF] [stroke width=15.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=250.00] [y1=10.00] [x2=250.00] [y2=175.00]
RenderSVGPath {rect} at (34,16) size 418x283 [stroke={[type=SOLID] [color=#000000]}] [x=20.00] [y=10.00] [width=230.00] [height=155.00]
RenderSVGContainer {g} at (54,0) size 382x279 [opacity=0.50]
- RenderSVGText {text} at (30,0) size 138x126 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 138x126
+ RenderSVGText {text} at (30,0) size 138x125 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 138x125
chunk 1 text run 1 at (30.00,90.00) startOffset 0 endOffset 2 width 88.32: "SV"
chunk 1 text run 2 at (123.12,90.00) startOffset 2 endOffset 3 width 44.04: "G"
RenderSVGPath {rect} at (126,99) size 234x126 [fill={[type=SOLID] [color=#820032]}] [x=70.00] [y=55.00] [width=130.00] [height=70.00]
diff --git a/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt b/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt
index 2f3b446..f85af92 100644
--- a/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt
@@ -25,15 +25,15 @@ layer at (173,47) size 453x188
RenderText {#text} at (63,-1) size 340x190
text run at (63,-1) width 327: "CSS ZEN"
text run at (56,93) width 340: "GARDEN"
-layer at (173,118) size 453x20
- RenderBlock (positioned) {H2} at (0,86) size 453x20 [color=#EEFF00]
- RenderInline {SPAN} at (0,0) size 149x19
- RenderText {#text} at (152,0) size 88x19
+layer at (173,118) size 453x19
+ RenderBlock (positioned) {H2} at (0,86) size 453x19 [color=#EEFF00]
+ RenderInline {SPAN} at (0,0) size 149x18
+ RenderText {#text} at (152,0) size 88x18
text run at (152,0) width 88: "The Beauty of "
- RenderInline {ACRONYM} at (0,0) size 21x19
- RenderText {#text} at (240,0) size 21x19
+ RenderInline {ACRONYM} at (0,0) size 21x18
+ RenderText {#text} at (240,0) size 21x18
text run at (240,0) width 21: "CSS"
- RenderText {#text} at (261,0) size 40x19
+ RenderText {#text} at (261,0) size 40x18
text run at (261,0) width 40: " Design"
layer at (173,351) size 453x134
RenderBlock (positioned) {DIV} at (0,319) size 453x134
diff --git a/LayoutTests/platform/mac/svg/custom/svg-fonts-with-no-element-reference-expected.txt b/LayoutTests/platform/mac/svg/custom/svg-fonts-with-no-element-reference-expected.txt
index c775497..bc162ba 100644
--- a/LayoutTests/platform/mac/svg/custom/svg-fonts-with-no-element-reference-expected.txt
+++ b/LayoutTests/platform/mac/svg/custom/svg-fonts-with-no-element-reference-expected.txt
@@ -1,11 +1,11 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x94
- RenderBlock {HTML} at (0,0) size 800x94
- RenderBody {BODY} at (8,18) size 784x58
- RenderBlock {P} at (0,0) size 784x20
- RenderText {#text} at (0,0) size 278x19
+layer at (0,0) size 800x92
+ RenderBlock {HTML} at (0,0) size 800x92
+ RenderBody {BODY} at (8,18) size 784x56
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 278x18
text run at (0,0) width 278: "This text should be rendered with a first font."
- RenderBlock {P} at (0,38) size 784x20
- RenderText {#text} at (0,0) size 287x19
+ RenderBlock {P} at (0,37) size 784x19
+ RenderText {#text} at (0,0) size 287x18
text run at (0,0) width 287: "This text should be rendered with a second font."
diff --git a/LayoutTests/platform/mac/svg/text/text-hkern-expected.txt b/LayoutTests/platform/mac/svg/text/text-hkern-expected.txt
index b674367..572b29a 100644
--- a/LayoutTests/platform/mac/svg/text/text-hkern-expected.txt
+++ b/LayoutTests/platform/mac/svg/text/text-hkern-expected.txt
@@ -1,27 +1,27 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (4,29) size 142x115
+ RenderSVGRoot {svg} at (4,31) size 142x111
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGPath {path} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [data="M 2.5 70 L 200 70"]
- RenderSVGText {text} at (0,-8) size 70x10 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 70x10
+ RenderSVGText {text} at (0,-7) size 70x8 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 70x8
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
chunk 1 text run 2 at (17.50,0.00) startOffset 1 endOffset 2 width 5.00: "2"
chunk 1 text run 3 at (37.50,0.00) startOffset 2 endOffset 3 width 7.50: "3"
chunk 1 text run 4 at (60.00,0.00) startOffset 3 endOffset 4 width 10.00: "4"
- RenderSVGText {text} at (0,-8) size 40x10 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 3x10
+ RenderSVGText {text} at (0,-7) size 40x8 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 3x8
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
- RenderSVGTSpan {tspan} at (0,0) size 28x10
- RenderSVGInlineText {#text} at (2,0) size 28x10
+ RenderSVGTSpan {tspan} at (0,0) size 28x8
+ RenderSVGInlineText {#text} at (2,0) size 28x8
chunk 1 text run 1 at (2.50,0.00) startOffset 0 endOffset 1 width 5.00: "2"
chunk 1 text run 2 at (22.50,0.00) startOffset 1 endOffset 2 width 7.50: "3"
- RenderSVGInlineText {#text} at (30,0) size 10x10
+ RenderSVGInlineText {#text} at (30,0) size 10x8
chunk 1 text run 1 at (30.00,0.00) startOffset 0 endOffset 1 width 10.00: "4"
- RenderSVGText {text} at (2,62) size 71x10 contains 1 chunk(s)
- RenderSVGTextPath {textPath} at (0,0) size 71x10
- RenderSVGInlineText {#text} at (0,0) size 71x10
+ RenderSVGText {text} at (2,63) size 71x8 contains 1 chunk(s)
+ RenderSVGTextPath {textPath} at (0,0) size 71x8
+ RenderSVGInlineText {#text} at (0,0) size 71x8
chunk 1 text run 1 at (3.75,70.00) startOffset 0 endOffset 1 width 2.50: "1"
chunk 1 text run 2 at (22.50,70.00) startOffset 1 endOffset 2 width 5.00: "2"
chunk 1 text run 3 at (43.75,70.00) startOffset 2 endOffset 3 width 7.50: "3"
diff --git a/LayoutTests/platform/mac/svg/text/text-hkern-on-vertical-text-expected.txt b/LayoutTests/platform/mac/svg/text/text-hkern-on-vertical-text-expected.txt
index 3fbe5bd..0658c5d 100644
--- a/LayoutTests/platform/mac/svg/text/text-hkern-on-vertical-text-expected.txt
+++ b/LayoutTests/platform/mac/svg/text/text-hkern-on-vertical-text-expected.txt
@@ -1,12 +1,12 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (10,90) size 20x80
+ RenderSVGRoot {svg} at (10,90) size 20x64
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGContainer {g} at (10,90) size 20x80
- RenderSVGText {text} at (-5,0) size 10x40 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 10x40
- chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 10.00: "1"
- chunk 1 (vertical) text run 2 at (-3.00,10.00) startOffset 1 endOffset 2 height 10.00: "2"
- chunk 1 (vertical) text run 3 at (-3.00,20.00) startOffset 2 endOffset 3 height 10.00: "3"
- chunk 1 (vertical) text run 4 at (-3.00,30.00) startOffset 3 endOffset 4 height 10.00: "4"
+ RenderSVGContainer {g} at (10,90) size 20x64
+ RenderSVGText {text} at (-5,0) size 10x32 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 10x32
+ chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 8.00: "1"
+ chunk 1 (vertical) text run 2 at (-3.00,8.00) startOffset 1 endOffset 2 height 8.00: "2"
+ chunk 1 (vertical) text run 3 at (-3.00,16.00) startOffset 2 endOffset 3 height 8.00: "3"
+ chunk 1 (vertical) text run 4 at (-3.00,24.00) startOffset 3 endOffset 4 height 8.00: "4"
diff --git a/LayoutTests/platform/mac/svg/text/text-text-04-t-expected.txt b/LayoutTests/platform/mac/svg/text/text-text-04-t-expected.txt
index df7f196..1c0944f 100644
--- a/LayoutTests/platform/mac/svg/text/text-text-04-t-expected.txt
+++ b/LayoutTests/platform/mac/svg/text/text-text-04-t-expected.txt
@@ -3,12 +3,12 @@ layer at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 800x600
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGContainer {g} at (60,31) size 697x486
- RenderSVGContainer {g} at (60,31) size 257x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,40.00)}]
+ RenderSVGContainer {g} at (60,33) size 697x482
+ RenderSVGContainer {g} at (60,33) size 257x41 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,40.00)}]
RenderSVGText {text} at (-94,-14) size 64x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 64x18
chunk 1 (end anchor) text run 1 at (-94.00,0.00) startOffset 0 endOffset 9 width 64.00: "Reference"
- RenderSVGContainer {g} at (210,31) size 107x44
+ RenderSVGContainer {g} at (210,33) size 107x41
RenderSVGContainer {use} at (210,60) size 14x14
RenderSVGContainer {g} at (210,60) size 14x14
RenderSVGPath {rect} at (210,60) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
@@ -21,12 +21,12 @@ layer at (0,0) size 800x600
RenderSVGContainer {use} at (285,60) size 14x14
RenderSVGContainer {g} at (285,60) size 14x14 [transform={m=((1.00,0.00)(0.00,1.00)) t=(45.00,0.00)}]
RenderSVGPath {rect} at (285,60) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (0,-21) size 60x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 60x26
+ RenderSVGText {text} at (0,-20) size 60x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 60x24
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 4 width 60.00: "1234"
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGPath {rect} at (0,0) size 7x7 [fill={[type=SOLID] [color=#000000]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGContainer {g} at (121,98) size 254x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,80.00)}]
+ RenderSVGContainer {g} at (121,100) size 254x40 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,80.00)}]
RenderSVGText {text} at (-57,-14) size 27x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 27x18
chunk 1 (end anchor) text run 1 at (-57.00,0.00) startOffset 0 endOffset 5 width 27.00: "x all"
@@ -45,13 +45,13 @@ layer at (0,0) size 800x600
RenderSVGContainer {use} at (343,126) size 14x14
RenderSVGContainer {g} at (343,126) size 14x14 [transform={m=((1.00,0.00)(0.00,1.00)) t=(80.00,0.00)}]
RenderSVGPath {rect} at (343,126) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-21) size 75x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 75x26
+ RenderSVGText {text} at (20,-20) size 75x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 75x24
chunk 1 text run 1 at (20.00,0.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,0.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,0.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (80.00,0.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (93,165) size 297x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,120.00)}]
+ RenderSVGContainer {g} at (93,166) size 297x41 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,120.00)}]
RenderSVGText {text} at (-74,-14) size 44x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 44x18
chunk 1 (end anchor) text run 1 at (-74.00,0.00) startOffset 0 endOffset 6 width 44.00: "x more"
@@ -73,13 +73,13 @@ layer at (0,0) size 800x600
RenderSVGContainer {use} at (376,193) size 14x14
RenderSVGContainer {g} at (376,193) size 14x14 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,0.00)}]
RenderSVGPath {rect} at (376,193) size 14x14 [fill={[type=SOLID] [color=#FF0000]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-21) size 75x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 75x26
+ RenderSVGText {text} at (20,-20) size 75x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 75x24
chunk 1 text run 1 at (20.00,0.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,0.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,0.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (80.00,0.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (86,231) size 281x44 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,160.00)}]
+ RenderSVGContainer {g} at (86,233) size 281x41 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,160.00)}]
RenderSVGText {text} at (-78,-14) size 48x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 48x18
chunk 1 (end anchor) text run 1 at (-78.00,0.00) startOffset 0 endOffset 7 width 48.00: "x fewer"
@@ -98,12 +98,12 @@ layer at (0,0) size 800x600
RenderSVGContainer {use} at (335,260) size 14x14
RenderSVGContainer {g} at (335,260) size 14x14 [transform={m=((1.00,0.00)(0.00,1.00)) t=(75.00,0.00)}]
RenderSVGPath {rect} at (335,260) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-21) size 70x26 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 70x26
+ RenderSVGText {text} at (20,-20) size 70x24 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 70x24
chunk 1 text run 1 at (20.00,0.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,0.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,0.00) startOffset 0 endOffset 2 width 30.00: "34"
- RenderSVGContainer {g} at (121,281) size 196x78 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,200.00)}]
+ RenderSVGContainer {g} at (121,283) size 196x74 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,200.00)}]
RenderSVGText {text} at (-57,-14) size 27x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 27x18
chunk 1 (end anchor) text run 1 at (-57.00,0.00) startOffset 0 endOffset 5 width 27.00: "y all"
@@ -119,13 +119,13 @@ layer at (0,0) size 800x600
RenderSVGContainer {use} at (285,343) size 14x14
RenderSVGContainer {g} at (285,343) size 14x14 [transform={m=((1.00,0.00)(0.00,1.00)) t=(45.00,10.00)}]
RenderSVGPath {rect} at (285,343) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (0,-31) size 60x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 60x46
+ RenderSVGText {text} at (0,-30) size 60x44 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 60x44
chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (15.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (30.00,5.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (45.00,10.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (93,365) size 224x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,250.00)}]
+ RenderSVGContainer {g} at (93,366) size 224x74 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,250.00)}]
RenderSVGText {text} at (-74,-14) size 44x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 44x18
chunk 1 (end anchor) text run 1 at (-74.00,0.00) startOffset 0 endOffset 6 width 44.00: "y more"
@@ -141,13 +141,13 @@ layer at (0,0) size 800x600
RenderSVGContainer {use} at (285,426) size 14x14
RenderSVGContainer {g} at (285,426) size 14x14 [transform={m=((1.00,0.00)(0.00,1.00)) t=(45.00,10.00)}]
RenderSVGPath {rect} at (285,426) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (0,-31) size 60x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 60x46
+ RenderSVGText {text} at (0,-30) size 60x44 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 60x44
chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (15.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (30.00,5.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (45.00,10.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (86,448) size 231x69 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,300.00)}]
+ RenderSVGContainer {g} at (86,450) size 231x65 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,300.00)}]
RenderSVGText {text} at (-78,-14) size 48x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 48x18
chunk 1 (end anchor) text run 1 at (-78.00,0.00) startOffset 0 endOffset 7 width 48.00: "y fewer"
@@ -163,13 +163,13 @@ layer at (0,0) size 800x600
RenderSVGContainer {use} at (285,501) size 14x14
RenderSVGContainer {g} at (285,501) size 14x14 [transform={m=((1.00,0.00)(0.00,1.00)) t=(45.00,5.00)}]
RenderSVGPath {rect} at (285,501) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (0,-31) size 60x41 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 60x41
+ RenderSVGText {text} at (0,-30) size 60x39 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 60x39
chunk 1 text run 1 at (0.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (15.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (30.00,5.00) startOffset 0 endOffset 2 width 30.00: "34"
- RenderSVGContainer {g} at (401,81) size 356x344 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
- RenderSVGContainer {g} at (468,81) size 274x78 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,80.00)}]
+ RenderSVGContainer {g} at (401,83) size 356x341 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,0.00)}]
+ RenderSVGContainer {g} at (468,83) size 274x74 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,80.00)}]
RenderSVGText {text} at (-69,-14) size 39x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 39x18
chunk 1 (end anchor) text run 1 at (-69.00,0.00) startOffset 0 endOffset 7 width 39.00: "x/y all"
@@ -188,13 +188,13 @@ layer at (0,0) size 800x600
RenderSVGContainer {use} at (710,143) size 14x14
RenderSVGContainer {g} at (710,143) size 14x14 [transform={m=((1.00,0.00)(0.00,1.00)) t=(80.00,10.00)}]
RenderSVGPath {rect} at (710,143) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-31) size 75x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 75x46
+ RenderSVGText {text} at (20,-30) size 75x44 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 75x44
chunk 1 text run 1 at (20.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,5.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (80.00,10.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (440,148) size 317x92 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,120.00)}]
+ RenderSVGContainer {g} at (440,150) size 317x90 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,120.00)}]
RenderSVGText {text} at (-86,-14) size 56x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 56x18
chunk 1 (end anchor) text run 1 at (-86.00,0.00) startOffset 0 endOffset 8 width 56.00: "x/y more"
@@ -216,13 +216,13 @@ layer at (0,0) size 800x600
RenderSVGContainer {use} at (743,226) size 14x14
RenderSVGContainer {g} at (743,226) size 14x14 [transform={m=((1.00,0.00)(0.00,1.00)) t=(100.00,20.00)}]
RenderSVGPath {rect} at (743,226) size 14x14 [fill={[type=SOLID] [color=#FF0000]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-31) size 75x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 75x46
+ RenderSVGText {text} at (20,-30) size 75x44 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 75x44
chunk 1 text run 1 at (20.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,5.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (80.00,10.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (433,215) size 301x69 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,160.00)}]
+ RenderSVGContainer {g} at (433,216) size 301x66 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,160.00)}]
RenderSVGText {text} at (-90,-14) size 60x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 60x18
chunk 1 (end anchor) text run 1 at (-90.00,0.00) startOffset 0 endOffset 9 width 60.00: "x/y fewer"
@@ -241,12 +241,12 @@ layer at (0,0) size 800x600
RenderSVGContainer {use} at (701,268) size 14x14
RenderSVGContainer {g} at (701,268) size 14x14 [transform={m=((1.00,0.00)(0.00,1.00)) t=(75.00,5.00)}]
RenderSVGPath {rect} at (701,268) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-31) size 70x41 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 70x41
+ RenderSVGText {text} at (20,-30) size 70x39 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 70x39
chunk 1 text run 1 at (20.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,5.00) startOffset 0 endOffset 2 width 30.00: "34"
- RenderSVGContainer {g} at (401,281) size 341x69 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,200.00)}]
+ RenderSVGContainer {g} at (401,283) size 341x66 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,200.00)}]
RenderSVGText {text} at (-109,-14) size 79x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 79x18
chunk 1 (end anchor) text run 1 at (-109.00,0.00) startOffset 0 endOffset 13 width 79.00: "x all y fewer"
@@ -265,13 +265,13 @@ layer at (0,0) size 800x600
RenderSVGContainer {use} at (710,335) size 14x14
RenderSVGContainer {g} at (710,335) size 14x14 [transform={m=((1.00,0.00)(0.00,1.00)) t=(80.00,5.00)}]
RenderSVGPath {rect} at (710,335) size 14x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-31) size 75x41 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 75x41
+ RenderSVGText {text} at (20,-30) size 75x39 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 75x39
chunk 1 text run 1 at (20.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,5.00) startOffset 0 endOffset 1 width 15.00: "3"
chunk 1 text run 1 at (80.00,5.00) startOffset 0 endOffset 1 width 15.00: "4"
- RenderSVGContainer {g} at (401,348) size 333x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,240.00)}]
+ RenderSVGContainer {g} at (401,350) size 333x74 [transform={m=((1.00,0.00)(0.00,1.00)) t=(130.00,240.00)}]
RenderSVGText {text} at (-109,-14) size 79x18 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 79x18
chunk 1 (end anchor) text run 1 at (-109.00,0.00) startOffset 0 endOffset 13 width 79.00: "x fewer y all"
@@ -290,8 +290,8 @@ layer at (0,0) size 800x600
RenderSVGContainer {use} at (705,410) size 15x14
RenderSVGContainer {g} at (705,410) size 15x14 [transform={m=((1.00,0.00)(0.00,1.00)) t=(77.52,10.00)}]
RenderSVGPath {rect} at (705,410) size 15x14 [fill={[type=SOLID] [color=#8888FF]}] [x=-4.00] [y=-4.00] [width=8.00] [height=8.00]
- RenderSVGText {text} at (20,-31) size 70x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 70x46
+ RenderSVGText {text} at (20,-30) size 70x44 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 70x44
chunk 1 text run 1 at (20.00,-10.00) startOffset 0 endOffset 1 width 15.00: "1"
chunk 1 text run 1 at (40.00,-5.00) startOffset 0 endOffset 1 width 15.00: "2"
chunk 1 text run 1 at (60.00,5.00) startOffset 0 endOffset 1 width 15.00: "3"
diff --git a/LayoutTests/platform/mac/svg/text/text-vkern-expected.txt b/LayoutTests/platform/mac/svg/text/text-vkern-expected.txt
index a82ea7e..505d4c4 100644
--- a/LayoutTests/platform/mac/svg/text/text-vkern-expected.txt
+++ b/LayoutTests/platform/mac/svg/text/text-vkern-expected.txt
@@ -1,25 +1,25 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (5,29) size 75x177
+ RenderSVGRoot {svg} at (5,31) size 75x159
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGPath {path} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [data="M 2.5 90 L 200 90"]
- RenderSVGText {text} at (0,-8) size 25x10 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 25x10
+ RenderSVGText {text} at (0,-7) size 25x8 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 25x8
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 4 width 25.00: "1234"
- RenderSVGContainer {g} at (10,90) size 70x116
- RenderSVGText {text} at (-5,0) size 10x58 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 10x58
- chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 10.00: "1"
- chunk 1 (vertical) text run 2 at (-3.00,16.00) startOffset 1 endOffset 2 height 10.00: "2"
- chunk 1 (vertical) text run 3 at (-3.00,32.00) startOffset 2 endOffset 3 height 10.00: "3"
- chunk 1 (vertical) text run 4 at (-3.00,48.00) startOffset 3 endOffset 4 height 10.00: "4"
- RenderSVGText {text} at (-5,0) size 10x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (3,0) size 4x10
- chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 10.00: "1"
- RenderSVGTSpan {tspan} at (0,0) size 8x26
- RenderSVGInlineText {#text} at (1,10) size 8x26
- chunk 1 (vertical) text run 1 at (-3.00,10.00) startOffset 0 endOffset 1 height 10.00: "2"
- chunk 1 (vertical) text run 2 at (-3.00,26.00) startOffset 1 endOffset 2 height 10.00: "3"
- RenderSVGInlineText {#text} at (0,36) size 10x10
- chunk 1 (vertical) text run 1 at (-3.00,36.00) startOffset 0 endOffset 1 height 10.00: "4"
+ RenderSVGContainer {g} at (10,90) size 70x100
+ RenderSVGText {text} at (-5,0) size 10x50 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 10x50
+ chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 8.00: "1"
+ chunk 1 (vertical) text run 2 at (-3.00,14.00) startOffset 1 endOffset 2 height 8.00: "2"
+ chunk 1 (vertical) text run 3 at (-3.00,28.00) startOffset 2 endOffset 3 height 8.00: "3"
+ chunk 1 (vertical) text run 4 at (-3.00,42.00) startOffset 3 endOffset 4 height 8.00: "4"
+ RenderSVGText {text} at (-5,0) size 10x38 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (3,0) size 4x8
+ chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 8.00: "1"
+ RenderSVGTSpan {tspan} at (0,0) size 8x22
+ RenderSVGInlineText {#text} at (1,8) size 8x22
+ chunk 1 (vertical) text run 1 at (-3.00,8.00) startOffset 0 endOffset 1 height 8.00: "2"
+ chunk 1 (vertical) text run 2 at (-3.00,22.00) startOffset 1 endOffset 2 height 8.00: "3"
+ RenderSVGInlineText {#text} at (0,30) size 10x8
+ chunk 1 (vertical) text run 1 at (-3.00,30.00) startOffset 0 endOffset 1 height 8.00: "4"
diff --git a/LayoutTests/platform/mac/svg/text/text-vkern-on-horizontal-text-expected.txt b/LayoutTests/platform/mac/svg/text/text-vkern-on-horizontal-text-expected.txt
index 436a780..5a3be5d 100644
--- a/LayoutTests/platform/mac/svg/text/text-vkern-on-horizontal-text-expected.txt
+++ b/LayoutTests/platform/mac/svg/text/text-vkern-on-horizontal-text-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (5,29) size 50x20
+ RenderSVGRoot {svg} at (5,31) size 50x16
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGText {text} at (0,-8) size 25x10 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 25x10
+ RenderSVGText {text} at (0,-7) size 25x8 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 25x8
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 4 width 25.00: "1234"
diff --git a/LayoutTests/platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.txt b/LayoutTests/platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.txt
index bd9f957..7e064ef 100644
--- a/LayoutTests/platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.txt
+++ b/LayoutTests/platform/mac/svg/transforms/text-with-mask-with-svg-transform-expected.txt
@@ -38,9 +38,9 @@ layer at (0,0) size 800x600
RenderSVGPath {rect} at (21,270) size 158x104 [fill={[type=SOLID] [color=#FFFFFF] [opacity=0.20]}] [x=60.00] [y=225.00] [width=200.00] [height=25.00]
RenderSVGPath {rect} at (11,288) size 158x104 [fill={[type=SOLID] [color=#FFFFFF]}] [x=60.00] [y=250.00] [width=200.00] [height=25.00]
RenderSVGPath {rect} at (0,306) size 157x103 [fill={[type=SOLID] [color=#FFFFFF] [opacity=0.70]}] [x=60.00] [y=275.00] [width=200.00] [height=25.00]
- RenderSVGText {text} at (60,198) size 126x115 contains 1 chunk(s)
+ RenderSVGText {text} at (60,198) size 126x114 contains 1 chunk(s)
[masker="mask3"] RenderSVGResourceMasker {mask} at (60,200) size 200x100
- RenderSVGInlineText {#text} at (0,0) size 126x115
+ RenderSVGInlineText {#text} at (0,0) size 126x114
[masker="mask3"] RenderSVGResourceMasker {mask} at (60,200) size 200x100
chunk 1 text run 1 at (60.00,280.00) startOffset 0 endOffset 2 width 80.96: "SV"
chunk 1 text run 2 at (145.36,280.00) startOffset 2 endOffset 3 width 40.37: "G"
diff --git a/LayoutTests/platform/qt/css2.1/t1507-c526-font-sz-02-b-a-expected.txt b/LayoutTests/platform/qt/css2.1/t1507-c526-font-sz-02-b-a-expected.txt
index c77b247..263e861 100644
--- a/LayoutTests/platform/qt/css2.1/t1507-c526-font-sz-02-b-a-expected.txt
+++ b/LayoutTests/platform/qt/css2.1/t1507-c526-font-sz-02-b-a-expected.txt
@@ -1,18 +1,18 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x158
- RenderBlock {HTML} at (0,0) size 800x158
- RenderBody {BODY} at (8,16) size 784x134
+layer at (0,0) size 800x157
+ RenderBlock {HTML} at (0,0) size 800x157
+ RenderBody {BODY} at (8,16) size 784x133
RenderBlock {P} at (0,0) size 784x21
RenderText {#text} at (0,0) size 504x21
text run at (0,0) width 504: "There should be a solid single uninterrupted smooth column of blue below."
- RenderBlock {DIV} at (0,37) size 784x97 [color=#000080]
+ RenderBlock {DIV} at (0,37) size 784x96 [color=#000080]
RenderBlock {DIV} at (0,0) size 784x32
RenderText {#text} at (0,0) size 32x32
text run at (0,0) width 32: "x"
- RenderBlock {DIV} at (0,32) size 784x33
- RenderText {#text} at (0,0) size 33x33
- text run at (0,0) width 33: "x"
- RenderBlock {DIV} at (0,65) size 784x32
+ RenderBlock {DIV} at (0,32) size 784x32
+ RenderText {#text} at (0,0) size 32x32
+ text run at (0,0) width 32: "x"
+ RenderBlock {DIV} at (0,64) size 784x32
RenderText {#text} at (0,0) size 32x32
text run at (0,0) width 32: "x"
diff --git a/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt b/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt
index 2fc3232..63dcfb6 100644
--- a/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt
+++ b/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt
@@ -58,8 +58,8 @@ layer at (0,0) size 480x360
chunk 1 text run 4 at (182.83,340.00) startOffset 12 endOffset 13 width 8.90: "."
chunk 1 text run 5 at (188.50,340.00) startOffset 13 endOffset 16 width 44.48: "1 $"
RenderSVGPath {rect} at (0,0) size 480x360 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
- RenderSVGContainer {g} at (0,0) size 480x23
+ RenderSVGContainer {g} at (0,0) size 480x22
RenderSVGPath {rect} at (0,0) size 480x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FF0000]}] [x=1.00] [y=1.00] [width=478.00] [height=20.00]
- RenderSVGText {text} at (206,1) size 68x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 68x21
+ RenderSVGText {text} at (206,2) size 68x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 68x19
chunk 1 (middle anchor) text run 1 at (206.67,18.00) startOffset 0 endOffset 5 width 66.66: "DRAFT"
diff --git a/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt b/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt
index a602833..5991873 100644
--- a/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt
+++ b/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt
@@ -37,8 +37,8 @@ layer at (0,0) size 480x360
chunk 1 text run 4 at (182.83,340.00) startOffset 12 endOffset 13 width 8.90: "."
chunk 1 text run 5 at (188.50,340.00) startOffset 13 endOffset 16 width 44.48: "1 $"
RenderSVGPath {rect} at (0,0) size 480x360 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
- RenderSVGContainer {g} at (0,0) size 480x23
+ RenderSVGContainer {g} at (0,0) size 480x22
RenderSVGPath {rect} at (0,0) size 480x22 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FF0000]}] [x=1.00] [y=1.00] [width=478.00] [height=20.00]
- RenderSVGText {text} at (206,1) size 68x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 68x21
+ RenderSVGText {text} at (206,2) size 68x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 68x19
chunk 1 (middle anchor) text run 1 at (206.67,18.00) startOffset 0 endOffset 5 width 66.66: "DRAFT"
diff --git a/LayoutTests/platform/qt/svg/W3C-SVG-1.1/fonts-glyph-02-t-expected.txt b/LayoutTests/platform/qt/svg/W3C-SVG-1.1/fonts-glyph-02-t-expected.txt
index 56d357f..452297b 100644
--- a/LayoutTests/platform/qt/svg/W3C-SVG-1.1/fonts-glyph-02-t-expected.txt
+++ b/LayoutTests/platform/qt/svg/W3C-SVG-1.1/fonts-glyph-02-t-expected.txt
@@ -2,15 +2,15 @@ layer at (0,0) size 480x360
RenderView at (0,0) size 480x360
layer at (0,0) size 480x360
RenderSVGRoot {svg} at (0,0) size 480x360
- RenderSVGContainer {g} at (100,32) size 224x199
+ RenderSVGContainer {g} at (100,33) size 224x198
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGContainer {g} at (100,32) size 184x84
- RenderSVGText {text} at (100,32) size 184x84 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 184x84
+ RenderSVGContainer {g} at (100,33) size 184x82
+ RenderSVGText {text} at (100,33) size 184x82 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 184x82
chunk 1 text run 1 at (100.00,100.00) startOffset 0 endOffset 5 width 184.00 RTL: "\x{69A} \x{69A}\x{69A}\x{69A}"
- RenderSVGContainer {g} at (100,114) size 224x117
- RenderSVGText {text} at (100,114) size 224x117 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 224x117
+ RenderSVGContainer {g} at (100,115) size 224x116
+ RenderSVGText {text} at (100,115) size 224x116 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 224x116
chunk 1 text run 1 at (100.00,200.00) startOffset 0 endOffset 5 width 223.92 RTL: "\x{62E} \x{62E}\x{62E}\x{62E}"
RenderSVGText {text} at (10,301) size 270x52 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 270x52
diff --git a/LayoutTests/platform/qt/svg/text/text-hkern-expected.txt b/LayoutTests/platform/qt/svg/text/text-hkern-expected.txt
index b674367..572b29a 100644
--- a/LayoutTests/platform/qt/svg/text/text-hkern-expected.txt
+++ b/LayoutTests/platform/qt/svg/text/text-hkern-expected.txt
@@ -1,27 +1,27 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (4,29) size 142x115
+ RenderSVGRoot {svg} at (4,31) size 142x111
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGPath {path} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [data="M 2.5 70 L 200 70"]
- RenderSVGText {text} at (0,-8) size 70x10 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 70x10
+ RenderSVGText {text} at (0,-7) size 70x8 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 70x8
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
chunk 1 text run 2 at (17.50,0.00) startOffset 1 endOffset 2 width 5.00: "2"
chunk 1 text run 3 at (37.50,0.00) startOffset 2 endOffset 3 width 7.50: "3"
chunk 1 text run 4 at (60.00,0.00) startOffset 3 endOffset 4 width 10.00: "4"
- RenderSVGText {text} at (0,-8) size 40x10 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 3x10
+ RenderSVGText {text} at (0,-7) size 40x8 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 3x8
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
- RenderSVGTSpan {tspan} at (0,0) size 28x10
- RenderSVGInlineText {#text} at (2,0) size 28x10
+ RenderSVGTSpan {tspan} at (0,0) size 28x8
+ RenderSVGInlineText {#text} at (2,0) size 28x8
chunk 1 text run 1 at (2.50,0.00) startOffset 0 endOffset 1 width 5.00: "2"
chunk 1 text run 2 at (22.50,0.00) startOffset 1 endOffset 2 width 7.50: "3"
- RenderSVGInlineText {#text} at (30,0) size 10x10
+ RenderSVGInlineText {#text} at (30,0) size 10x8
chunk 1 text run 1 at (30.00,0.00) startOffset 0 endOffset 1 width 10.00: "4"
- RenderSVGText {text} at (2,62) size 71x10 contains 1 chunk(s)
- RenderSVGTextPath {textPath} at (0,0) size 71x10
- RenderSVGInlineText {#text} at (0,0) size 71x10
+ RenderSVGText {text} at (2,63) size 71x8 contains 1 chunk(s)
+ RenderSVGTextPath {textPath} at (0,0) size 71x8
+ RenderSVGInlineText {#text} at (0,0) size 71x8
chunk 1 text run 1 at (3.75,70.00) startOffset 0 endOffset 1 width 2.50: "1"
chunk 1 text run 2 at (22.50,70.00) startOffset 1 endOffset 2 width 5.00: "2"
chunk 1 text run 3 at (43.75,70.00) startOffset 2 endOffset 3 width 7.50: "3"
diff --git a/LayoutTests/platform/qt/svg/text/text-hkern-on-vertical-text-expected.txt b/LayoutTests/platform/qt/svg/text/text-hkern-on-vertical-text-expected.txt
index 3fbe5bd..0658c5d 100644
--- a/LayoutTests/platform/qt/svg/text/text-hkern-on-vertical-text-expected.txt
+++ b/LayoutTests/platform/qt/svg/text/text-hkern-on-vertical-text-expected.txt
@@ -1,12 +1,12 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (10,90) size 20x80
+ RenderSVGRoot {svg} at (10,90) size 20x64
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGContainer {g} at (10,90) size 20x80
- RenderSVGText {text} at (-5,0) size 10x40 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 10x40
- chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 10.00: "1"
- chunk 1 (vertical) text run 2 at (-3.00,10.00) startOffset 1 endOffset 2 height 10.00: "2"
- chunk 1 (vertical) text run 3 at (-3.00,20.00) startOffset 2 endOffset 3 height 10.00: "3"
- chunk 1 (vertical) text run 4 at (-3.00,30.00) startOffset 3 endOffset 4 height 10.00: "4"
+ RenderSVGContainer {g} at (10,90) size 20x64
+ RenderSVGText {text} at (-5,0) size 10x32 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 10x32
+ chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 8.00: "1"
+ chunk 1 (vertical) text run 2 at (-3.00,8.00) startOffset 1 endOffset 2 height 8.00: "2"
+ chunk 1 (vertical) text run 3 at (-3.00,16.00) startOffset 2 endOffset 3 height 8.00: "3"
+ chunk 1 (vertical) text run 4 at (-3.00,24.00) startOffset 3 endOffset 4 height 8.00: "4"
diff --git a/LayoutTests/platform/qt/svg/text/text-vkern-expected.txt b/LayoutTests/platform/qt/svg/text/text-vkern-expected.txt
index a82ea7e..505d4c4 100644
--- a/LayoutTests/platform/qt/svg/text/text-vkern-expected.txt
+++ b/LayoutTests/platform/qt/svg/text/text-vkern-expected.txt
@@ -1,25 +1,25 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (5,29) size 75x177
+ RenderSVGRoot {svg} at (5,31) size 75x159
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGPath {path} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [data="M 2.5 90 L 200 90"]
- RenderSVGText {text} at (0,-8) size 25x10 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 25x10
+ RenderSVGText {text} at (0,-7) size 25x8 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 25x8
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 4 width 25.00: "1234"
- RenderSVGContainer {g} at (10,90) size 70x116
- RenderSVGText {text} at (-5,0) size 10x58 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 10x58
- chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 10.00: "1"
- chunk 1 (vertical) text run 2 at (-3.00,16.00) startOffset 1 endOffset 2 height 10.00: "2"
- chunk 1 (vertical) text run 3 at (-3.00,32.00) startOffset 2 endOffset 3 height 10.00: "3"
- chunk 1 (vertical) text run 4 at (-3.00,48.00) startOffset 3 endOffset 4 height 10.00: "4"
- RenderSVGText {text} at (-5,0) size 10x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (3,0) size 4x10
- chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 10.00: "1"
- RenderSVGTSpan {tspan} at (0,0) size 8x26
- RenderSVGInlineText {#text} at (1,10) size 8x26
- chunk 1 (vertical) text run 1 at (-3.00,10.00) startOffset 0 endOffset 1 height 10.00: "2"
- chunk 1 (vertical) text run 2 at (-3.00,26.00) startOffset 1 endOffset 2 height 10.00: "3"
- RenderSVGInlineText {#text} at (0,36) size 10x10
- chunk 1 (vertical) text run 1 at (-3.00,36.00) startOffset 0 endOffset 1 height 10.00: "4"
+ RenderSVGContainer {g} at (10,90) size 70x100
+ RenderSVGText {text} at (-5,0) size 10x50 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 10x50
+ chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 8.00: "1"
+ chunk 1 (vertical) text run 2 at (-3.00,14.00) startOffset 1 endOffset 2 height 8.00: "2"
+ chunk 1 (vertical) text run 3 at (-3.00,28.00) startOffset 2 endOffset 3 height 8.00: "3"
+ chunk 1 (vertical) text run 4 at (-3.00,42.00) startOffset 3 endOffset 4 height 8.00: "4"
+ RenderSVGText {text} at (-5,0) size 10x38 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (3,0) size 4x8
+ chunk 1 (vertical) text run 1 at (-3.00,0.00) startOffset 0 endOffset 1 height 8.00: "1"
+ RenderSVGTSpan {tspan} at (0,0) size 8x22
+ RenderSVGInlineText {#text} at (1,8) size 8x22
+ chunk 1 (vertical) text run 1 at (-3.00,8.00) startOffset 0 endOffset 1 height 8.00: "2"
+ chunk 1 (vertical) text run 2 at (-3.00,22.00) startOffset 1 endOffset 2 height 8.00: "3"
+ RenderSVGInlineText {#text} at (0,30) size 10x8
+ chunk 1 (vertical) text run 1 at (-3.00,30.00) startOffset 0 endOffset 1 height 8.00: "4"
diff --git a/LayoutTests/platform/qt/svg/text/text-vkern-on-horizontal-text-expected.txt b/LayoutTests/platform/qt/svg/text/text-vkern-on-horizontal-text-expected.txt
index 436a780..5a3be5d 100644
--- a/LayoutTests/platform/qt/svg/text/text-vkern-on-horizontal-text-expected.txt
+++ b/LayoutTests/platform/qt/svg/text/text-vkern-on-horizontal-text-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (5,29) size 50x20
+ RenderSVGRoot {svg} at (5,31) size 50x16
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGText {text} at (0,-8) size 25x10 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 25x10
+ RenderSVGText {text} at (0,-7) size 25x8 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 25x8
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 4 width 25.00: "1234"
diff --git a/LayoutTests/platform/qt/svg/transforms/text-with-mask-with-svg-transform-expected.txt b/LayoutTests/platform/qt/svg/transforms/text-with-mask-with-svg-transform-expected.txt
index 771126f..9490ba7 100644
--- a/LayoutTests/platform/qt/svg/transforms/text-with-mask-with-svg-transform-expected.txt
+++ b/LayoutTests/platform/qt/svg/transforms/text-with-mask-with-svg-transform-expected.txt
@@ -38,9 +38,9 @@ layer at (0,0) size 800x600
RenderSVGPath {rect} at (21,270) size 158x104 [fill={[type=SOLID] [color=#FFFFFF] [opacity=0.20]}] [x=60.00] [y=225.00] [width=200.00] [height=25.00]
RenderSVGPath {rect} at (11,288) size 158x104 [fill={[type=SOLID] [color=#FFFFFF]}] [x=60.00] [y=250.00] [width=200.00] [height=25.00]
RenderSVGPath {rect} at (0,306) size 157x103 [fill={[type=SOLID] [color=#FFFFFF] [opacity=0.70]}] [x=60.00] [y=275.00] [width=200.00] [height=25.00]
- RenderSVGText {text} at (60,198) size 126x115 contains 1 chunk(s)
+ RenderSVGText {text} at (60,198) size 126x114 contains 1 chunk(s)
[masker="mask3"] RenderSVGResourceMasker {mask} at (60,200) size 200x100
- RenderSVGInlineText {#text} at (0,0) size 126x115
+ RenderSVGInlineText {#text} at (0,0) size 126x114
[masker="mask3"] RenderSVGResourceMasker {mask} at (60,200) size 200x100
chunk 1 text run 1 at (60.00,280.00) startOffset 0 endOffset 2 width 80.96: "SV"
chunk 1 text run 2 at (145.36,280.00) startOffset 2 endOffset 3 width 40.37: "G"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list