[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:48:22 UTC 2011
The following commit has been merged in the webkit-1.3 branch:
commit 6f2945553754912fb11d45c98f5268dd173909ff
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jan 25 13:34:28 2011 +0000
2011-01-25 Nikolas Zimmermann <nzimmermann at rim.com>
Introduce FontMetrics abstraction
https://bugs.webkit.org/show_bug.cgi?id=51456
Update gtk/qt baseline.
* platform/gtk/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt:
* platform/gtk/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.txt:
* platform/gtk/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.txt:
* platform/gtk/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt:
* platform/gtk/svg/custom/svg-fonts-without-missing-glyph-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/qt/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt:
* platform/qt/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.txt:
* platform/qt/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-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/custom/svg-fonts-with-no-element-reference-expected.txt:
* platform/qt/svg/custom/svg-fonts-without-missing-glyph-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@76588 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f94032b..16171a8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,32 @@
+2011-01-25 Nikolas Zimmermann <nzimmermann at rim.com>
+
+ Introduce FontMetrics abstraction
+ https://bugs.webkit.org/show_bug.cgi?id=51456
+
+ Update gtk/qt baseline.
+
+ * platform/gtk/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt:
+ * platform/gtk/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.txt:
+ * platform/gtk/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.txt:
+ * platform/gtk/svg/W3C-SVG-1.1-SE/pservers-pattern-03-f-expected.txt:
+ * platform/gtk/svg/custom/svg-fonts-without-missing-glyph-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/qt/svg/W3C-SVG-1.1-SE/filters-image-03-f-expected.txt:
+ * platform/qt/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.txt:
+ * platform/qt/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-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/custom/svg-fonts-with-no-element-reference-expected.txt:
+ * platform/qt/svg/custom/svg-fonts-without-missing-glyph-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:
+
2011-01-25 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Yury Semikhatsky.
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 63dcfb6..8717dff 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
@@ -49,17 +49,17 @@ layer at (0,0) size 480x360
RenderSVGPath {rect} at (159,199) size 52x52 [stroke={[type=SOLID] [color=#0000FF]}] [x=100.00] [y=100.00] [width=50.00] [height=50.00]
RenderSVGPath {rect} at (259,199) size 52x52 [stroke={[type=SOLID] [color=#0000FF]}] [x=200.00] [y=100.00] [width=50.00] [height=50.00]
RenderSVGPath {rect} at (359,199) size 52x52 [stroke={[type=SOLID] [color=#0000FF]}] [x=300.00] [y=100.00] [width=50.00] [height=50.00]
- RenderSVGContainer {g} at (10,314) size 223x32
- RenderSVGText {text} at (10,314) size 223x32 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 223x32
+ RenderSVGContainer {g} at (10,313) size 223x33
+ RenderSVGText {text} at (10,313) size 223x33 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 223x33
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"
chunk 1 text run 3 at (67.82,340.00) startOffset 3 endOffset 12 width 117.38: "vision: 1"
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 480x22
+ RenderSVGContainer {g} at (0,0) size 480x23
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,2) size 68x19 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 68x19
+ RenderSVGText {text} at (206,1) size 68x21 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 68x21
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-grad-17-b-expected.txt b/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.txt
index 24d02dd..ed26be5 100644
--- a/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.txt
+++ b/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-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 (49,81) size 376x172
+ RenderSVGContainer {g} at (49,81) size 376x173
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceLinearGradient {linearGradient} [id="grad"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,0)]
RenderSVGGradientStop {stop} [offset=0.00] [color=#000000]
@@ -14,8 +14,8 @@ layer at (0,0) size 480x360
RenderSVGPath {line} at (119,82) size 6x144 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(420.00,-60.00)}] [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=180.00] [x2=480.00] [y2=180.00]
RenderSVGPath {line} at (68,100) size 108x108 [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=410.00] [y1=10.00] [x2=70.00] [y2=350.00]
RenderSVGPath {rect} at (49,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
- RenderSVGText {text} at (69,236) size 102x17 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 102x17
+ RenderSVGText {text} at (69,235) size 102x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 102x19
chunk 1 (middle anchor) text run 1 at (69.04,250.00) startOffset 0 endOffset 1 width 16.99: "W"
chunk 1 (middle anchor) text run 2 at (86.02,250.00) startOffset 1 endOffset 3 width 9.00: "it"
chunk 1 (middle anchor) text run 3 at (94.96,250.00) startOffset 3 endOffset 6 width 20.02: "h f"
@@ -27,16 +27,16 @@ layer at (0,0) size 480x360
RenderSVGPath {line} at (349,82) size 6x144 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(420.00,-60.00)}] [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=180.00] [x2=480.00] [y2=180.00]
RenderSVGPath {line} at (298,100) size 108x108 [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=410.00] [y1=10.00] [x2=70.00] [y2=350.00]
RenderSVGPath {rect} at (279,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
- RenderSVGText {text} at (286,236) size 128x17 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 128x17
+ RenderSVGText {text} at (286,235) size 128x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 128x19
chunk 1 (middle anchor) text run 1 at (286.53,250.00) startOffset 0 endOffset 1 width 16.99: "W"
chunk 1 (middle anchor) text run 2 at (303.51,250.00) startOffset 1 endOffset 3 width 9.00: "it"
chunk 1 (middle anchor) text run 3 at (312.45,250.00) startOffset 3 endOffset 9 width 45.04: "hout f"
chunk 1 (middle anchor) text run 4 at (357.33,250.00) startOffset 9 endOffset 15 width 47.02: "allbac"
chunk 1 (middle anchor) text run 5 at (404.47,250.00) startOffset 15 endOffset 16 width 9.00: "k"
- RenderSVGContainer {g} at (10,314) size 227x32
- RenderSVGText {text} at (10,314) size 227x32 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 227x32
+ RenderSVGContainer {g} at (10,313) size 227x33
+ RenderSVGText {text} at (10,313) size 227x33 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 227x33
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"
chunk 1 text run 3 at (67.82,340.00) startOffset 3 endOffset 12 width 117.38: "vision: 1"
diff --git a/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.txt b/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.txt
index 1e4190f..5653efa 100644
--- a/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.txt
+++ b/LayoutTests/platform/gtk/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-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 (49,81) size 376x172
+ RenderSVGContainer {g} at (49,81) size 376x173
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceLinearGradient {linearGradient} [id="grad"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,0)]
RenderSVGGradientStop {stop} [offset=0.00] [color=#000000]
@@ -14,8 +14,8 @@ layer at (0,0) size 480x360
RenderSVGPath {path} at (119,82) size 6x144 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(420.00,-60.00)}] [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M 0 180 L 480 180"]
RenderSVGPath {path} at (68,100) size 108x108 [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M 410 10 L 70 350"]
RenderSVGPath {rect} at (49,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
- RenderSVGText {text} at (69,236) size 102x17 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 102x17
+ RenderSVGText {text} at (69,235) size 102x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 102x19
chunk 1 (middle anchor) text run 1 at (69.04,250.00) startOffset 0 endOffset 1 width 16.99: "W"
chunk 1 (middle anchor) text run 2 at (86.02,250.00) startOffset 1 endOffset 3 width 9.00: "it"
chunk 1 (middle anchor) text run 3 at (94.96,250.00) startOffset 3 endOffset 6 width 20.02: "h f"
@@ -27,16 +27,16 @@ layer at (0,0) size 480x360
RenderSVGPath {path} at (349,82) size 6x144 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(420.00,-60.00)}] [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M 0 180 L 480 180"]
RenderSVGPath {path} at (298,100) size 108x108 [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M 410 10 L 70 350"]
RenderSVGPath {rect} at (279,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
- RenderSVGText {text} at (286,236) size 128x17 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 128x17
+ RenderSVGText {text} at (286,235) size 128x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 128x19
chunk 1 (middle anchor) text run 1 at (286.53,250.00) startOffset 0 endOffset 1 width 16.99: "W"
chunk 1 (middle anchor) text run 2 at (303.51,250.00) startOffset 1 endOffset 3 width 9.00: "it"
chunk 1 (middle anchor) text run 3 at (312.45,250.00) startOffset 3 endOffset 9 width 45.04: "hout f"
chunk 1 (middle anchor) text run 4 at (357.33,250.00) startOffset 9 endOffset 15 width 47.02: "allbac"
chunk 1 (middle anchor) text run 5 at (404.47,250.00) startOffset 15 endOffset 16 width 9.00: "k"
- RenderSVGContainer {g} at (10,314) size 227x32
- RenderSVGText {text} at (10,314) size 227x32 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 227x32
+ RenderSVGContainer {g} at (10,313) size 227x33
+ RenderSVGText {text} at (10,313) size 227x33 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 227x33
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"
chunk 1 text run 3 at (67.82,340.00) startOffset 3 endOffset 12 width 117.38: "vision: 1"
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 5991873..a17ae72 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
@@ -28,17 +28,17 @@ layer at (0,0) size 480x360
RenderSVGPath {rect} at (139,159) size 102x102 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="invisible6"]}] [x=100.00] [y=100.00] [width=100.00] [height=100.00]
RenderSVGPath {rect} at (239,159) size 102x102 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="invisible7"]}] [x=200.00] [y=100.00] [width=100.00] [height=100.00]
RenderSVGPath {rect} at (339,159) size 102x102 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#00FF00]}] [x=300.00] [y=100.00] [width=100.00] [height=100.00]
- RenderSVGContainer {g} at (10,314) size 223x32
- RenderSVGText {text} at (10,314) size 223x32 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 223x32
+ RenderSVGContainer {g} at (10,313) size 223x33
+ RenderSVGText {text} at (10,313) size 223x33 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 223x33
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"
chunk 1 text run 3 at (67.82,340.00) startOffset 3 endOffset 12 width 117.38: "vision: 1"
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 480x22
+ RenderSVGContainer {g} at (0,0) size 480x23
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,2) size 68x19 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 68x19
+ RenderSVGText {text} at (206,1) size 68x21 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 68x21
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/custom/svg-fonts-without-missing-glyph-expected.txt b/LayoutTests/platform/gtk/svg/custom/svg-fonts-without-missing-glyph-expected.txt
index f43417c..999f62d 100644
--- a/LayoutTests/platform/gtk/svg/custom/svg-fonts-without-missing-glyph-expected.txt
+++ b/LayoutTests/platform/gtk/svg/custom/svg-fonts-without-missing-glyph-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x274
- RenderBlock {html} at (0,0) size 800x274
- RenderBody {body} at (8,21) size 784x237
+layer at (0,0) size 800x284
+ RenderBlock {html} at (0,0) size 800x284
+ RenderBody {body} at (8,21) size 784x247
RenderBlock {h1} at (0,0) size 784x37
RenderText {#text} at (0,0) size 115x36
text run at (0,0) width 115: "Test for "
@@ -12,18 +12,18 @@ layer at (0,0) size 800x274
RenderBlock {p} at (0,58) size 784x19
RenderText {#text} at (0,0) size 506x19
text run at (0,0) width 506: "Following text should be rendered as usual. Only \"A\" has a glyph in SVG Font."
- RenderBlock {p} at (0,93) size 784x16
- RenderText {#text} at (0,0) size 37x15
- text run at (0,0) width 37: "XXA"
- RenderBlock {p} at (0,125) size 784x16
- RenderText {#text} at (0,0) size 37x15
- text run at (0,0) width 37: "XAX"
- RenderBlock {p} at (0,157) size 784x16
- RenderText {#text} at (0,0) size 37x15
- text run at (0,0) width 37: "AXX"
- RenderBlock {p} at (0,189) size 784x16
- RenderText {#text} at (0,0) size 36x15
- text run at (0,0) width 36: "XXX"
- RenderBlock {p} at (0,221) size 784x16
- RenderText {#text} at (0,0) size 38x15
- text run at (0,0) width 38: "AAA"
+ RenderBlock {p} at (0,93) size 784x18
+ RenderText {#text} at (0,1) size 37x16
+ text run at (0,1) width 37: "XXA"
+ RenderBlock {p} at (0,127) size 784x18
+ RenderText {#text} at (0,1) size 37x16
+ text run at (0,1) width 37: "XAX"
+ RenderBlock {p} at (0,161) size 784x18
+ RenderText {#text} at (0,1) size 37x16
+ text run at (0,1) width 37: "AXX"
+ RenderBlock {p} at (0,195) size 784x18
+ RenderText {#text} at (0,1) size 36x16
+ text run at (0,1) width 36: "XXX"
+ RenderBlock {p} at (0,229) size 784x18
+ RenderText {#text} at (0,1) size 38x16
+ text run at (0,1) width 38: "AAA"
diff --git a/LayoutTests/platform/gtk/svg/text/text-hkern-expected.txt b/LayoutTests/platform/gtk/svg/text/text-hkern-expected.txt
index 572b29a..b674367 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,31) size 142x111
+ RenderSVGRoot {svg} at (4,29) size 142x115
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,-7) size 70x8 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 70x8
+ RenderSVGText {text} at (0,-8) size 70x10 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 70x10
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,-7) size 40x8 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 3x8
+ RenderSVGText {text} at (0,-8) size 40x10 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 3x10
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
- RenderSVGTSpan {tspan} at (0,0) size 28x8
- RenderSVGInlineText {#text} at (2,0) size 28x8
+ RenderSVGTSpan {tspan} at (0,0) size 28x10
+ RenderSVGInlineText {#text} at (2,0) size 28x10
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 10x8
+ RenderSVGInlineText {#text} at (30,0) size 10x10
chunk 1 text run 1 at (30.00,0.00) startOffset 0 endOffset 1 width 10.00: "4"
- 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
+ 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
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 0658c5d..3fbe5bd 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 20x64
+ RenderSVGRoot {svg} at (10,90) size 20x80
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- 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"
+ 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"
diff --git a/LayoutTests/platform/gtk/svg/text/text-vkern-expected.txt b/LayoutTests/platform/gtk/svg/text/text-vkern-expected.txt
index 505d4c4..a82ea7e 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,31) size 75x159
+ RenderSVGRoot {svg} at (5,29) size 75x177
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,-7) size 25x8 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 25x8
+ RenderSVGText {text} at (0,-8) size 25x10 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 25x10
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 4 width 25.00: "1234"
- 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"
+ 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"
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 5a3be5d..436a780 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,31) size 50x16
+ RenderSVGRoot {svg} at (5,29) size 50x20
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGText {text} at (0,-7) size 25x8 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 25x8
+ RenderSVGText {text} at (0,-8) size 25x10 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 25x10
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/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 63dcfb6..8717dff 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
@@ -49,17 +49,17 @@ layer at (0,0) size 480x360
RenderSVGPath {rect} at (159,199) size 52x52 [stroke={[type=SOLID] [color=#0000FF]}] [x=100.00] [y=100.00] [width=50.00] [height=50.00]
RenderSVGPath {rect} at (259,199) size 52x52 [stroke={[type=SOLID] [color=#0000FF]}] [x=200.00] [y=100.00] [width=50.00] [height=50.00]
RenderSVGPath {rect} at (359,199) size 52x52 [stroke={[type=SOLID] [color=#0000FF]}] [x=300.00] [y=100.00] [width=50.00] [height=50.00]
- RenderSVGContainer {g} at (10,314) size 223x32
- RenderSVGText {text} at (10,314) size 223x32 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 223x32
+ RenderSVGContainer {g} at (10,313) size 223x33
+ RenderSVGText {text} at (10,313) size 223x33 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 223x33
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"
chunk 1 text run 3 at (67.82,340.00) startOffset 3 endOffset 12 width 117.38: "vision: 1"
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 480x22
+ RenderSVGContainer {g} at (0,0) size 480x23
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,2) size 68x19 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 68x19
+ RenderSVGText {text} at (206,1) size 68x21 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 68x21
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-grad-17-b-expected.txt b/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.txt
index 24d02dd..ed26be5 100644
--- a/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.txt
+++ b/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-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 (49,81) size 376x172
+ RenderSVGContainer {g} at (49,81) size 376x173
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceLinearGradient {linearGradient} [id="grad"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,0)]
RenderSVGGradientStop {stop} [offset=0.00] [color=#000000]
@@ -14,8 +14,8 @@ layer at (0,0) size 480x360
RenderSVGPath {line} at (119,82) size 6x144 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(420.00,-60.00)}] [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=180.00] [x2=480.00] [y2=180.00]
RenderSVGPath {line} at (68,100) size 108x108 [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=410.00] [y1=10.00] [x2=70.00] [y2=350.00]
RenderSVGPath {rect} at (49,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
- RenderSVGText {text} at (69,236) size 102x17 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 102x17
+ RenderSVGText {text} at (69,235) size 102x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 102x19
chunk 1 (middle anchor) text run 1 at (69.04,250.00) startOffset 0 endOffset 1 width 16.99: "W"
chunk 1 (middle anchor) text run 2 at (86.02,250.00) startOffset 1 endOffset 3 width 9.00: "it"
chunk 1 (middle anchor) text run 3 at (94.96,250.00) startOffset 3 endOffset 6 width 20.02: "h f"
@@ -27,16 +27,16 @@ layer at (0,0) size 480x360
RenderSVGPath {line} at (349,82) size 6x144 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(420.00,-60.00)}] [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=0.00] [y1=180.00] [x2=480.00] [y2=180.00]
RenderSVGPath {line} at (298,100) size 108x108 [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [x1=410.00] [y1=10.00] [x2=70.00] [y2=350.00]
RenderSVGPath {rect} at (279,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
- RenderSVGText {text} at (286,236) size 128x17 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 128x17
+ RenderSVGText {text} at (286,235) size 128x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 128x19
chunk 1 (middle anchor) text run 1 at (286.53,250.00) startOffset 0 endOffset 1 width 16.99: "W"
chunk 1 (middle anchor) text run 2 at (303.51,250.00) startOffset 1 endOffset 3 width 9.00: "it"
chunk 1 (middle anchor) text run 3 at (312.45,250.00) startOffset 3 endOffset 9 width 45.04: "hout f"
chunk 1 (middle anchor) text run 4 at (357.33,250.00) startOffset 9 endOffset 15 width 47.02: "allbac"
chunk 1 (middle anchor) text run 5 at (404.47,250.00) startOffset 15 endOffset 16 width 9.00: "k"
- RenderSVGContainer {g} at (10,314) size 227x32
- RenderSVGText {text} at (10,314) size 227x32 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 227x32
+ RenderSVGContainer {g} at (10,313) size 227x33
+ RenderSVGText {text} at (10,313) size 227x33 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 227x33
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"
chunk 1 text run 3 at (67.82,340.00) startOffset 3 endOffset 12 width 117.38: "vision: 1"
diff --git a/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.txt b/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.txt
index 1e4190f..5653efa 100644
--- a/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.txt
+++ b/LayoutTests/platform/qt/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-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 (49,81) size 376x172
+ RenderSVGContainer {g} at (49,81) size 376x173
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceLinearGradient {linearGradient} [id="grad"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,0)]
RenderSVGGradientStop {stop} [offset=0.00] [color=#000000]
@@ -14,8 +14,8 @@ layer at (0,0) size 480x360
RenderSVGPath {path} at (119,82) size 6x144 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(420.00,-60.00)}] [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M 0 180 L 480 180"]
RenderSVGPath {path} at (68,100) size 108x108 [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M 410 10 L 70 350"]
RenderSVGPath {rect} at (49,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
- RenderSVGText {text} at (69,236) size 102x17 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 102x17
+ RenderSVGText {text} at (69,235) size 102x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 102x19
chunk 1 (middle anchor) text run 1 at (69.04,250.00) startOffset 0 endOffset 1 width 16.99: "W"
chunk 1 (middle anchor) text run 2 at (86.02,250.00) startOffset 1 endOffset 3 width 9.00: "it"
chunk 1 (middle anchor) text run 3 at (94.96,250.00) startOffset 3 endOffset 6 width 20.02: "h f"
@@ -27,16 +27,16 @@ layer at (0,0) size 480x360
RenderSVGPath {path} at (349,82) size 6x144 [transform={m=((0.00,1.00)(-1.00,0.00)) t=(420.00,-60.00)}] [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M 0 180 L 480 180"]
RenderSVGPath {path} at (298,100) size 108x108 [stroke={[type=LINEAR-GRADIENT] [id="grad"] [stroke width=20.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M 410 10 L 70 350"]
RenderSVGPath {rect} at (279,81) size 146x146 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=-60.00] [width=480.00] [height=480.00]
- RenderSVGText {text} at (286,236) size 128x17 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 128x17
+ RenderSVGText {text} at (286,235) size 128x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 128x19
chunk 1 (middle anchor) text run 1 at (286.53,250.00) startOffset 0 endOffset 1 width 16.99: "W"
chunk 1 (middle anchor) text run 2 at (303.51,250.00) startOffset 1 endOffset 3 width 9.00: "it"
chunk 1 (middle anchor) text run 3 at (312.45,250.00) startOffset 3 endOffset 9 width 45.04: "hout f"
chunk 1 (middle anchor) text run 4 at (357.33,250.00) startOffset 9 endOffset 15 width 47.02: "allbac"
chunk 1 (middle anchor) text run 5 at (404.47,250.00) startOffset 15 endOffset 16 width 9.00: "k"
- RenderSVGContainer {g} at (10,314) size 227x32
- RenderSVGText {text} at (10,314) size 227x32 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 227x32
+ RenderSVGContainer {g} at (10,313) size 227x33
+ RenderSVGText {text} at (10,313) size 227x33 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 227x33
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"
chunk 1 text run 3 at (67.82,340.00) startOffset 3 endOffset 12 width 117.38: "vision: 1"
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 5991873..a17ae72 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
@@ -28,17 +28,17 @@ layer at (0,0) size 480x360
RenderSVGPath {rect} at (139,159) size 102x102 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="invisible6"]}] [x=100.00] [y=100.00] [width=100.00] [height=100.00]
RenderSVGPath {rect} at (239,159) size 102x102 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=PATTERN] [id="invisible7"]}] [x=200.00] [y=100.00] [width=100.00] [height=100.00]
RenderSVGPath {rect} at (339,159) size 102x102 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#00FF00]}] [x=300.00] [y=100.00] [width=100.00] [height=100.00]
- RenderSVGContainer {g} at (10,314) size 223x32
- RenderSVGText {text} at (10,314) size 223x32 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 223x32
+ RenderSVGContainer {g} at (10,313) size 223x33
+ RenderSVGText {text} at (10,313) size 223x33 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 223x33
chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 2 width 40.90: "$R"
chunk 1 text run 2 at (50.51,340.00) startOffset 2 endOffset 3 width 17.79: "e"
chunk 1 text run 3 at (67.82,340.00) startOffset 3 endOffset 12 width 117.38: "vision: 1"
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 480x22
+ RenderSVGContainer {g} at (0,0) size 480x23
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,2) size 68x19 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 68x19
+ RenderSVGText {text} at (206,1) size 68x21 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 68x21
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 452297b..09987a0 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,33) size 224x198
+ RenderSVGContainer {g} at (100,32) size 224x200
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- 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
+ 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
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,115) size 224x116
- RenderSVGText {text} at (100,115) size 224x116 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 224x116
+ RenderSVGContainer {g} at (100,114) size 224x118
+ RenderSVGText {text} at (100,114) size 224x118 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 224x118
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/custom/svg-fonts-with-no-element-reference-expected.txt b/LayoutTests/platform/qt/svg/custom/svg-fonts-with-no-element-reference-expected.txt
index bc162ba..fab7da1 100644
--- a/LayoutTests/platform/qt/svg/custom/svg-fonts-with-no-element-reference-expected.txt
+++ b/LayoutTests/platform/qt/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 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,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."
+layer at (0,0) size 800x96
+ RenderBlock {HTML} at (0,0) size 800x96
+ RenderBody {BODY} at (8,18) size 784x60
+ RenderBlock {P} at (0,0) size 784x21
+ RenderText {#text} at (0,1) size 278x19
+ text run at (0,1) width 278: "This text should be rendered with a first font."
+ RenderBlock {P} at (0,39) size 784x21
+ RenderText {#text} at (0,1) size 287x19
+ text run at (0,1) width 287: "This text should be rendered with a second font."
diff --git a/LayoutTests/platform/qt/svg/custom/svg-fonts-without-missing-glyph-expected.txt b/LayoutTests/platform/qt/svg/custom/svg-fonts-without-missing-glyph-expected.txt
index 6c3d811..45a8791 100644
--- a/LayoutTests/platform/qt/svg/custom/svg-fonts-without-missing-glyph-expected.txt
+++ b/LayoutTests/platform/qt/svg/custom/svg-fonts-without-missing-glyph-expected.txt
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x281
- RenderBlock {html} at (0,0) size 800x281
- RenderBody {body} at (8,21) size 784x244
+layer at (0,0) size 800x291
+ RenderBlock {html} at (0,0) size 800x291
+ RenderBody {body} at (8,21) size 784x254
RenderBlock {h1} at (0,0) size 784x42
RenderText {#text} at (0,0) size 115x41
text run at (0,0) width 115: "Test for "
@@ -12,18 +12,18 @@ layer at (0,0) size 800x281
RenderBlock {p} at (0,63) size 784x21
RenderText {#text} at (0,0) size 539x21
text run at (0,0) width 539: "Following text should be rendered as usual. Only \"A\" has a glyph in SVG Font."
- RenderBlock {p} at (0,100) size 784x16
- RenderText {#text} at (0,0) size 37x15
- text run at (0,0) width 37: "XXA"
- RenderBlock {p} at (0,132) size 784x16
- RenderText {#text} at (0,0) size 37x15
- text run at (0,0) width 37: "XAX"
- RenderBlock {p} at (0,164) size 784x16
- RenderText {#text} at (0,0) size 37x15
- text run at (0,0) width 37: "AXX"
- RenderBlock {p} at (0,196) size 784x16
- RenderText {#text} at (0,0) size 36x15
- text run at (0,0) width 36: "XXX"
- RenderBlock {p} at (0,228) size 784x16
- RenderText {#text} at (0,0) size 38x15
- text run at (0,0) width 38: "AAA"
+ RenderBlock {p} at (0,100) size 784x18
+ RenderText {#text} at (0,1) size 37x16
+ text run at (0,1) width 37: "XXA"
+ RenderBlock {p} at (0,134) size 784x18
+ RenderText {#text} at (0,1) size 37x16
+ text run at (0,1) width 37: "XAX"
+ RenderBlock {p} at (0,168) size 784x18
+ RenderText {#text} at (0,1) size 37x16
+ text run at (0,1) width 37: "AXX"
+ RenderBlock {p} at (0,202) size 784x18
+ RenderText {#text} at (0,1) size 36x16
+ text run at (0,1) width 36: "XXX"
+ RenderBlock {p} at (0,236) size 784x18
+ RenderText {#text} at (0,1) size 38x16
+ text run at (0,1) width 38: "AAA"
diff --git a/LayoutTests/platform/qt/svg/text/text-hkern-expected.txt b/LayoutTests/platform/qt/svg/text/text-hkern-expected.txt
index 572b29a..b674367 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,31) size 142x111
+ RenderSVGRoot {svg} at (4,29) size 142x115
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,-7) size 70x8 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 70x8
+ RenderSVGText {text} at (0,-8) size 70x10 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 70x10
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,-7) size 40x8 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 3x8
+ RenderSVGText {text} at (0,-8) size 40x10 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 3x10
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 1 width 2.50: "1"
- RenderSVGTSpan {tspan} at (0,0) size 28x8
- RenderSVGInlineText {#text} at (2,0) size 28x8
+ RenderSVGTSpan {tspan} at (0,0) size 28x10
+ RenderSVGInlineText {#text} at (2,0) size 28x10
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 10x8
+ RenderSVGInlineText {#text} at (30,0) size 10x10
chunk 1 text run 1 at (30.00,0.00) startOffset 0 endOffset 1 width 10.00: "4"
- 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
+ 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
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 0658c5d..3fbe5bd 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 20x64
+ RenderSVGRoot {svg} at (10,90) size 20x80
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- 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"
+ 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"
diff --git a/LayoutTests/platform/qt/svg/text/text-vkern-expected.txt b/LayoutTests/platform/qt/svg/text/text-vkern-expected.txt
index 505d4c4..a82ea7e 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,31) size 75x159
+ RenderSVGRoot {svg} at (5,29) size 75x177
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,-7) size 25x8 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 25x8
+ RenderSVGText {text} at (0,-8) size 25x10 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 25x10
chunk 1 text run 1 at (0.00,0.00) startOffset 0 endOffset 4 width 25.00: "1234"
- 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"
+ 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"
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 5a3be5d..436a780 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,31) size 50x16
+ RenderSVGRoot {svg} at (5,29) size 50x20
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGText {text} at (0,-7) size 25x8 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 25x8
+ RenderSVGText {text} at (0,-8) size 25x10 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 25x10
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 9490ba7..771126f 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 126x114 contains 1 chunk(s)
+ RenderSVGText {text} at (60,198) size 126x115 contains 1 chunk(s)
[masker="mask3"] RenderSVGResourceMasker {mask} at (60,200) size 200x100
- RenderSVGInlineText {#text} at (0,0) size 126x114
+ RenderSVGInlineText {#text} at (0,0) size 126x115
[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