[Qt] Unreviewed morning gardening.

* platform/qt/Skipped:
* platform/qt/fast/block/float/centered-float-avoidance-complexity-expected.png: Added.
* platform/qt/fast/block/float/centered-float-avoidance-complexity-expected.txt: Added.
* platform/qt/fast/block/float/shrink-to-avoid-float-complexity-expected.png: Added.
* platform/qt/fast/block/float/shrink-to-avoid-float-complexity-expected.txt: Added.
* platform/qt/fast/dom/prototype-inheritance-2-expected.txt:
* platform/qt/fast/js/global-constructors-expected.png:
* platform/qt/fast/js/global-constructors-expected.txt:
* platform/qt/fast/repaint/region-painting-invalidation-expected.png: Added.
* platform/qt/fast/repaint/region-painting-invalidation-expected.txt: Added.
* platform/qt/svg/carto.net/window-expected.png:
* platform/qt/svg/carto.net/window-expected.txt:
* platform/qt/svg/custom/js-late-clipPath-and-object-creation-expected.png:
* platform/qt/svg/custom/js-late-clipPath-and-object-creation-expected.txt:
* platform/qt/svg/custom/js-late-gradient-and-object-creation-expected.png:
* platform/qt/svg/custom/js-late-gradient-and-object-creation-expected.txt:
* platform/qt/svg/custom/pointer-events-text-css-transform-expected.png:
* platform/qt/svg/custom/pointer-events-text-css-transform-expected.txt:
* platform/qt/svg/custom/text-ctm-expected.png:
* platform/qt/svg/custom/text-ctm-expected.txt:
* platform/qt/svg/hixie/perf/003-expected.png:
* platform/qt/svg/hixie/perf/003-expected.txt:
* platform/qt/svg/text/ems-display-none-expected.png: Added.
* platform/qt/svg/text/ems-display-none-expected.txt: Added.
* platform/qt/svg/text/exs-display-none-expected.png: Added.
* platform/qt/svg/text/exs-display-none-expected.txt: Added.
* platform/qt/svg/text/text-fill-opacity-expected.png: Added.
* platform/qt/svg/text/text-fill-opacity-expected.txt: Added.
* platform/qt/svg/text/text-viewbox-rescale-expected.png: Added.
* platform/qt/svg/text/text-viewbox-rescale-expected.txt: Added.
* platform/qt/svg/text/tspan-dynamic-positioning-expected.png: Added.
* platform/qt/svg/text/tspan-dynamic-positioning-expected.txt: Added.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108736 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 4eac0a5..de7e21f 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,40 @@
+2012-02-23  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [Qt] Unreviewed morning gardening.
+
+        * platform/qt/Skipped:
+        * platform/qt/fast/block/float/centered-float-avoidance-complexity-expected.png: Added.
+        * platform/qt/fast/block/float/centered-float-avoidance-complexity-expected.txt: Added.
+        * platform/qt/fast/block/float/shrink-to-avoid-float-complexity-expected.png: Added.
+        * platform/qt/fast/block/float/shrink-to-avoid-float-complexity-expected.txt: Added.
+        * platform/qt/fast/dom/prototype-inheritance-2-expected.txt:
+        * platform/qt/fast/js/global-constructors-expected.png:
+        * platform/qt/fast/js/global-constructors-expected.txt:
+        * platform/qt/fast/repaint/region-painting-invalidation-expected.png: Added.
+        * platform/qt/fast/repaint/region-painting-invalidation-expected.txt: Added.
+        * platform/qt/svg/carto.net/window-expected.png:
+        * platform/qt/svg/carto.net/window-expected.txt:
+        * platform/qt/svg/custom/js-late-clipPath-and-object-creation-expected.png:
+        * platform/qt/svg/custom/js-late-clipPath-and-object-creation-expected.txt:
+        * platform/qt/svg/custom/js-late-gradient-and-object-creation-expected.png:
+        * platform/qt/svg/custom/js-late-gradient-and-object-creation-expected.txt:
+        * platform/qt/svg/custom/pointer-events-text-css-transform-expected.png:
+        * platform/qt/svg/custom/pointer-events-text-css-transform-expected.txt:
+        * platform/qt/svg/custom/text-ctm-expected.png:
+        * platform/qt/svg/custom/text-ctm-expected.txt:
+        * platform/qt/svg/hixie/perf/003-expected.png:
+        * platform/qt/svg/hixie/perf/003-expected.txt:
+        * platform/qt/svg/text/ems-display-none-expected.png: Added.
+        * platform/qt/svg/text/ems-display-none-expected.txt: Added.
+        * platform/qt/svg/text/exs-display-none-expected.png: Added.
+        * platform/qt/svg/text/exs-display-none-expected.txt: Added.
+        * platform/qt/svg/text/text-fill-opacity-expected.png: Added.
+        * platform/qt/svg/text/text-fill-opacity-expected.txt: Added.
+        * platform/qt/svg/text/text-viewbox-rescale-expected.png: Added.
+        * platform/qt/svg/text/text-viewbox-rescale-expected.txt: Added.
+        * platform/qt/svg/text/tspan-dynamic-positioning-expected.png: Added.
+        * platform/qt/svg/text/tspan-dynamic-positioning-expected.txt: Added.
+
 2012-02-23  Kenichi Ishibashi  <bashi@chromium.org>
 
         Adding WebSocket per-frame DEFLATE extension

diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 2107331..92466de 100644 (file)
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -161,6 +161,7 @@ fast/css/style-scoped
 # ENABLE(SHADOW_DOM) is disabled.
 fast/dom/shadow/content-element-api.html
 fast/dom/shadow/content-element-outside-shadow.html
+fast/dom/shadow/iframe-shadow.html
 fast/dom/shadow/shadow-root-js-api.html
 fast/dom/shadow/shadow-disable.html
 fast/dom/shadow/shadow-root-attached.html
@@ -1416,6 +1417,10 @@ svg/dynamic-updates/SVGMaskElement-svgdom-width-prop.html
 # Crashes due to debug assert until we fix issues with style elements in SVG
 svg/custom/use-referencing-style-crash.svg
 
+# [Qt] svg/text/text-rescale.html fails
+# https://bugs.webkit.org/show_bug.cgi?id=79451
+svg/text/text-rescale.html
+
 # ============================================================================= #
 # Failing CSS Tests
 # ============================================================================= #

diff --git a/LayoutTests/platform/qt/fast/block/float/centered-float-avoidance-complexity-expected.png b/LayoutTests/platform/qt/fast/block/float/centered-float-avoidance-complexity-expected.png
new file mode 100644 (file)
index 0000000..621a904
Binary files /dev/null and b/LayoutTests/platform/qt/fast/block/float/centered-float-avoidance-complexity-expected.png differ

diff --git a/LayoutTests/platform/qt/fast/block/float/centered-float-avoidance-complexity-expected.txt b/LayoutTests/platform/qt/fast/block/float/centered-float-avoidance-complexity-expected.txt
new file mode 100644 (file)
index 0000000..c99432f
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/block/float/centered-float-avoidance-complexity-expected.txt
@@ -0,0 +1,96 @@
+layer at (0,0) size 784x690
+  RenderView at (0,0) size 784x600
+layer at (0,0) size 784x690
+  RenderBlock {HTML} at (0,0) size 784x690
+    RenderBody {BODY} at (8,21) size 768x651
+      RenderBlock {H1} at (0,0) size 768x84
+        RenderText {#text} at (0,0) size 606x42
+          text run at (0,0) width 606: "Margins and block formating contexts ("
+        RenderInline {A} at (0,0) size 760x84 [color=#0000EE]
+          RenderText {#text} at (606,0) size 760x84
+            text run at (606,0) width 154: "additional"
+            text run at (0,42) width 362: "tests from Alan Gresley"
+        RenderText {#text} at (362,42) size 11x42
+          text run at (362,42) width 11: ")"
+      RenderBlock {H3} at (0,105) size 768x75
+        RenderText {#text} at (0,0) size 766x25
+          text run at (0,0) width 766: "The orange stripe has 'overflow: auto', 'margin-left: 100px' and 'margin-right: 100px'"
+        RenderBR {BR} at (766,0) size 0x25
+        RenderText {#text} at (0,25) size 741x25
+          text run at (0,25) width 741: "The lime stripes are floats with various width (topmost is 0, bottommost is 150px)"
+        RenderBR {BR} at (741,25) size 0x25
+        RenderText {#text} at (0,50) size 449x25
+          text run at (0,50) width 449: "The wrapping container has a solid silver border."
+      RenderBlock {DIV} at (16,198) size 650x31 [border: (5px solid #C0C0C0)]
+        RenderBlock (floating) {DIV} at (5,5) size 0x16 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 39x21
+            text run at (0,0) width 39: "floatL"
+      RenderBlock {DIV} at (16,245) size 650x31 [border: (5px solid #C0C0C0)]
+        RenderBlock (floating) {DIV} at (5,5) size 50x16 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 39x21
+            text run at (0,0) width 39: "floatL"
+      RenderBlock {DIV} at (16,292) size 650x31 [border: (5px solid #C0C0C0)]
+        RenderBlock (floating) {DIV} at (5,5) size 100x16 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 39x21
+            text run at (0,0) width 39: "floatL"
+      RenderBlock {DIV} at (16,339) size 650x31 [border: (5px solid #C0C0C0)]
+        RenderBlock (floating) {DIV} at (5,5) size 150x16 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 87x21
+            text run at (0,0) width 87: "floatL 150px"
+      RenderBlock {DIV} at (16,386) size 650x31 [border: (5px solid #C0C0C0)]
+        RenderBlock (floating) {DIV} at (645,5) size 0x16 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 42x21
+            text run at (0,0) width 42: "floatR"
+      RenderBlock {DIV} at (16,433) size 650x31 [border: (5px solid #C0C0C0)]
+        RenderBlock (floating) {DIV} at (595,5) size 50x16 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 42x21
+            text run at (0,0) width 42: "floatR"
+      RenderBlock {DIV} at (16,480) size 650x31 [border: (5px solid #C0C0C0)]
+        RenderBlock (floating) {DIV} at (545,5) size 100x16 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 42x21
+            text run at (0,0) width 42: "floatR"
+      RenderBlock {DIV} at (16,527) size 650x31 [border: (5px solid #C0C0C0)]
+        RenderBlock (floating) {DIV} at (495,5) size 150x16 [bgcolor=#00FF00]
+          RenderText {#text} at (0,0) size 90x21
+            text run at (0,0) width 90: "floatR 150px"
+      RenderBlock {H3} at (0,576) size 768x75
+        RenderText {#text} at (0,0) size 736x25
+          text run at (0,0) width 736: "The orange stripe has 'overflow: auto', 'margin-left: auto' and 'margin-right: auto'"
+        RenderBR {BR} at (736,0) size 0x25
+        RenderText {#text} at (0,25) size 741x25
+          text run at (0,25) width 741: "The lime stripes are floats with various width (topmost is 0, bottommost is 150px)"
+        RenderBR {BR} at (741,25) size 0x25
+        RenderText {#text} at (0,50) size 449x25
+          text run at (0,50) width 449: "The wrapping container has a solid silver border."
+layer at (129,224) size 440x21
+  RenderBlock {DIV} at (105,5) size 440x21 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 181x21
+      text run at (0,0) width 181: "<div> with 'overflow: auto'"
+layer at (129,271) size 440x21
+  RenderBlock {DIV} at (105,5) size 440x21 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 181x21
+      text run at (0,0) width 181: "<div> with 'overflow: auto'"
+layer at (129,318) size 440x21
+  RenderBlock {DIV} at (105,5) size 440x21 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 181x21
+      text run at (0,0) width 181: "<div> with 'overflow: auto'"
+layer at (179,365) size 390x21
+  RenderBlock {DIV} at (155,5) size 390x21 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 181x21
+      text run at (0,0) width 181: "<div> with 'overflow: auto'"
+layer at (129,412) size 440x21
+  RenderBlock {DIV} at (105,5) size 440x21 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 181x21
+      text run at (0,0) width 181: "<div> with 'overflow: auto'"
+layer at (129,459) size 440x21
+  RenderBlock {DIV} at (105,5) size 440x21 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 181x21
+      text run at (0,0) width 181: "<div> with 'overflow: auto'"
+layer at (129,506) size 440x21
+  RenderBlock {DIV} at (105,5) size 440x21 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 181x21
+      text run at (0,0) width 181: "<div> with 'overflow: auto'"
+layer at (129,553) size 390x21
+  RenderBlock {DIV} at (105,5) size 390x21 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 181x21
+      text run at (0,0) width 181: "<div> with 'overflow: auto'"

diff --git a/LayoutTests/platform/qt/fast/block/float/shrink-to-avoid-float-complexity-expected.png b/LayoutTests/platform/qt/fast/block/float/shrink-to-avoid-float-complexity-expected.png
new file mode 100644 (file)
index 0000000..7cdc4bd
Binary files /dev/null and b/LayoutTests/platform/qt/fast/block/float/shrink-to-avoid-float-complexity-expected.png differ

diff --git a/LayoutTests/platform/qt/fast/block/float/shrink-to-avoid-float-complexity-expected.txt b/LayoutTests/platform/qt/fast/block/float/shrink-to-avoid-float-complexity-expected.txt
new file mode 100644 (file)
index 0000000..d889eb5
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/block/float/shrink-to-avoid-float-complexity-expected.txt
@@ -0,0 +1,347 @@
+layer at (0,0) size 784x2188
+  RenderView at (0,0) size 784x600
+layer at (0,0) size 784x2188
+  RenderBlock {HTML} at (0,0) size 784x2188
+    RenderBody {BODY} at (8,19) size 768x2153
+      RenderBlock {H2} at (0,0) size 768x32
+        RenderText {#text} at (0,0) size 163x32
+          text run at (0,0) width 163: "Test 1 (1 float)"
+      RenderBlock {HR} at (48,299) size 672x2 [border: (1px inset #000000)]
+      RenderBlock {H2} at (0,349) size 768x32
+        RenderText {#text} at (0,0) size 163x32
+          text run at (0,0) width 163: "Test 2 (1 float)"
+      RenderBlock {HR} at (48,648) size 672x2 [border: (1px inset #000000)]
+      RenderBlock {H2} at (0,698) size 768x32
+        RenderText {#text} at (0,0) size 163x32
+          text run at (0,0) width 163: "Test 3 (1 float)"
+      RenderBlock {HR} at (48,997) size 672x2 [border: (1px inset #000000)]
+      RenderBlock {H2} at (0,1047) size 768x32
+        RenderText {#text} at (0,0) size 176x32
+          text run at (0,0) width 176: "Test 4 (2 floats)"
+      RenderBlock {HR} at (48,1346) size 672x2 [border: (1px inset #000000)]
+      RenderBlock {H2} at (0,1396) size 768x32
+        RenderText {#text} at (0,0) size 176x32
+          text run at (0,0) width 176: "Test 5 (2 floats)"
+      RenderBlock {HR} at (48,1695) size 672x2 [border: (1px inset #000000)]
+      RenderBlock {H2} at (0,1745) size 768x32
+        RenderText {#text} at (0,0) size 176x32
+          text run at (0,0) width 176: "Test 6 (2 floats)"
+layer at (8,70) size 768x200
+  RenderBlock {DIV} at (0,51) size 768x200 [bgcolor=#C0C0C0]
+    RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
+      RenderText {#text} at (36,36) size 117x84
+        text run at (36,36) width 81: "This yellow"
+        text run at (36,57) width 117: "square is floated"
+        text run at (36,78) width 116: "left and it has no"
+        text run at (36,99) width 53: "margin."
+layer at (208,70) size 468x189
+  RenderBlock {DIV} at (200,0) size 468x189 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 159x21
+      text run at (0,0) width 159: "This orange rectangle:"
+    RenderBR {BR} at (159,0) size 0x21
+    RenderText {#text} at (0,21) size 111x21
+      text run at (0,21) width 111: "\x{2013} establishes a "
+    RenderInline {STRONG} at (0,0) size 215x21
+      RenderText {#text} at (111,21) size 215x21
+        text run at (111,21) width 215: "new block formating context"
+    RenderText {#text} at (326,21) size 458x42
+      text run at (326,21) width 132: " thanks to the CSS"
+      text run at (0,42) width 83: "declaration "
+    RenderInline {CODE} at (0,0) size 94x17
+      RenderText {#text} at (83,45) size 94x17
+        text run at (83,45) width 94: "overflow: hidden"
+    RenderText {#text} at (177,42) size 4x21
+      text run at (177,42) width 4: ";"
+    RenderBR {BR} at (181,42) size 0x21
+    RenderText {#text} at (0,63) size 362x21
+      text run at (0,63) width 362: "\x{2013} has a 100px left margin and a 100px right margin;"
+    RenderBR {BR} at (362,63) size 0x21
+    RenderBR {BR} at (0,84) size 0x21
+    RenderText {#text} at (0,105) size 159x21
+      text run at (0,105) width 159: "This orange rectangle:"
+    RenderBR {BR} at (159,105) size 0x21
+    RenderText {#text} at (0,126) size 111x21
+      text run at (0,126) width 111: "\x{2013} establishes a "
+    RenderInline {STRONG} at (0,0) size 215x21
+      RenderText {#text} at (111,126) size 215x21
+        text run at (111,126) width 215: "new block formating context"
+    RenderText {#text} at (326,126) size 458x42
+      text run at (326,126) width 132: " thanks to the CSS"
+      text run at (0,147) width 83: "declaration "
+    RenderInline {CODE} at (0,0) size 94x17
+      RenderText {#text} at (83,150) size 94x17
+        text run at (83,150) width 94: "overflow: hidden"
+    RenderText {#text} at (177,147) size 4x21
+      text run at (177,147) width 4: ";"
+    RenderBR {BR} at (181,147) size 0x21
+    RenderText {#text} at (0,168) size 362x21
+      text run at (0,168) width 362: "\x{2013} has a 100px left margin and a 100px right margin;"
+layer at (8,419) size 768x200
+  RenderBlock {DIV} at (0,400) size 768x200 [bgcolor=#C0C0C0]
+    RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
+      RenderText {#text} at (36,36) size 117x84
+        text run at (36,36) width 81: "This yellow"
+        text run at (36,57) width 117: "square is floated"
+        text run at (36,78) width 116: "left and it has no"
+        text run at (36,99) width 53: "margin."
+layer at (208,419) size 568x189
+  RenderBlock {DIV} at (200,0) size 568x189 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 159x21
+      text run at (0,0) width 159: "This orange rectangle:"
+    RenderBR {BR} at (159,0) size 0x21
+    RenderText {#text} at (0,21) size 111x21
+      text run at (0,21) width 111: "\x{2013} establishes a "
+    RenderInline {STRONG} at (0,0) size 215x21
+      RenderText {#text} at (111,21) size 215x21
+        text run at (111,21) width 215: "new block formating context"
+    RenderText {#text} at (326,21) size 215x21
+      text run at (326,21) width 215: " thanks to the CSS declaration"
+    RenderInline {CODE} at (0,0) size 94x17
+      RenderText {#text} at (0,45) size 94x17
+        text run at (0,45) width 94: "overflow: hidden"
+    RenderText {#text} at (94,42) size 4x21
+      text run at (94,42) width 4: ";"
+    RenderBR {BR} at (98,42) size 0x21
+    RenderText {#text} at (0,63) size 182x21
+      text run at (0,63) width 182: "\x{2013} has a 200px left margin;"
+    RenderBR {BR} at (182,63) size 0x21
+    RenderBR {BR} at (0,84) size 0x21
+    RenderText {#text} at (0,105) size 159x21
+      text run at (0,105) width 159: "This orange rectangle:"
+    RenderBR {BR} at (159,105) size 0x21
+    RenderText {#text} at (0,126) size 111x21
+      text run at (0,126) width 111: "\x{2013} establishes a "
+    RenderInline {STRONG} at (0,0) size 215x21
+      RenderText {#text} at (111,126) size 215x21
+        text run at (111,126) width 215: "new block formating context"
+    RenderText {#text} at (326,126) size 215x21
+      text run at (326,126) width 215: " thanks to the CSS declaration"
+    RenderInline {CODE} at (0,0) size 94x17
+      RenderText {#text} at (0,150) size 94x17
+        text run at (0,150) width 94: "overflow: hidden"
+    RenderText {#text} at (94,147) size 4x21
+      text run at (94,147) width 4: ";"
+    RenderBR {BR} at (98,147) size 0x21
+    RenderText {#text} at (0,168) size 182x21
+      text run at (0,168) width 182: "\x{2013} has a 200px left margin;"
+layer at (8,768) size 768x200
+  RenderBlock {DIV} at (0,749) size 768x200 [bgcolor=#C0C0C0]
+    RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
+      RenderText {#text} at (36,36) size 127x105
+        text run at (36,36) width 81: "This yellow"
+        text run at (36,57) width 78: "square is a"
+        text run at (36,78) width 116: "floated left and it"
+        text run at (36,99) width 127: "has a right margin"
+        text run at (36,120) width 65: "of 100px."
+layer at (308,768) size 368x189
+  RenderBlock {DIV} at (300,0) size 368x189 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 159x21
+      text run at (0,0) width 159: "This orange rectangle:"
+    RenderBR {BR} at (159,0) size 0x21
+    RenderText {#text} at (0,21) size 111x21
+      text run at (0,21) width 111: "\x{2013} establishes a "
+    RenderInline {STRONG} at (0,0) size 215x21
+      RenderText {#text} at (111,21) size 215x21
+        text run at (111,21) width 215: "new block formating context"
+    RenderText {#text} at (0,42) size 215x21
+      text run at (0,42) width 215: "thanks to the CSS declaration "
+    RenderInline {CODE} at (0,0) size 94x17
+      RenderText {#text} at (215,45) size 94x17
+        text run at (215,45) width 94: "overflow: hidden"
+    RenderText {#text} at (309,42) size 4x21
+      text run at (309,42) width 4: ";"
+    RenderBR {BR} at (313,42) size 0x21
+    RenderText {#text} at (0,63) size 344x21
+      text run at (0,63) width 344: "\x{2013} has a 0px left margin and a 100px right margin;"
+    RenderBR {BR} at (344,63) size 0x21
+    RenderBR {BR} at (0,84) size 0x21
+    RenderText {#text} at (0,105) size 159x21
+      text run at (0,105) width 159: "This orange rectangle:"
+    RenderBR {BR} at (159,105) size 0x21
+    RenderText {#text} at (0,126) size 111x21
+      text run at (0,126) width 111: "\x{2013} establishes a "
+    RenderInline {STRONG} at (0,0) size 215x21
+      RenderText {#text} at (111,126) size 215x21
+        text run at (111,126) width 215: "new block formating context"
+    RenderText {#text} at (0,147) size 215x21
+      text run at (0,147) width 215: "thanks to the CSS declaration "
+    RenderInline {CODE} at (0,0) size 94x17
+      RenderText {#text} at (215,150) size 94x17
+        text run at (215,150) width 94: "overflow: hidden"
+    RenderText {#text} at (309,147) size 4x21
+      text run at (309,147) width 4: ";"
+    RenderBR {BR} at (313,147) size 0x21
+    RenderText {#text} at (0,168) size 344x21
+      text run at (0,168) width 344: "\x{2013} has a 0px left margin and a 100px right margin;"
+layer at (8,1117) size 768x200
+  RenderBlock {DIV} at (0,1098) size 768x200 [bgcolor=#C0C0C0]
+    RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
+      RenderText {#text} at (36,36) size 117x84
+        text run at (36,36) width 81: "This yellow"
+        text run at (36,57) width 117: "square is floated"
+        text run at (36,78) width 116: "left and it has no"
+        text run at (36,99) width 53: "margin."
+    RenderBlock (floating) {DIV} at (568,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
+      RenderText {#text} at (36,36) size 126x84
+        text run at (36,36) width 81: "This yellow"
+        text run at (36,57) width 78: "square is a"
+        text run at (36,78) width 126: "floated right and it"
+        text run at (36,99) width 105: "has no margin."
+layer at (208,1117) size 368x189
+  RenderBlock {DIV} at (200,0) size 368x189 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 159x21
+      text run at (0,0) width 159: "This orange rectangle:"
+    RenderBR {BR} at (159,0) size 0x21
+    RenderText {#text} at (0,21) size 111x21
+      text run at (0,21) width 111: "\x{2013} establishes a "
+    RenderInline {STRONG} at (0,0) size 215x21
+      RenderText {#text} at (111,21) size 215x21
+        text run at (111,21) width 215: "new block formating context"
+    RenderText {#text} at (0,42) size 215x21
+      text run at (0,42) width 215: "thanks to the CSS declaration "
+    RenderInline {CODE} at (0,0) size 94x17
+      RenderText {#text} at (215,45) size 94x17
+        text run at (215,45) width 94: "overflow: hidden"
+    RenderText {#text} at (309,42) size 4x21
+      text run at (309,42) width 4: ";"
+    RenderBR {BR} at (313,42) size 0x21
+    RenderText {#text} at (0,63) size 362x21
+      text run at (0,63) width 362: "\x{2013} has a 100px left margin and a 100px right margin;"
+    RenderBR {BR} at (362,63) size 0x21
+    RenderBR {BR} at (0,84) size 0x21
+    RenderText {#text} at (0,105) size 159x21
+      text run at (0,105) width 159: "This orange rectangle:"
+    RenderBR {BR} at (159,105) size 0x21
+    RenderText {#text} at (0,126) size 111x21
+      text run at (0,126) width 111: "\x{2013} establishes a "
+    RenderInline {STRONG} at (0,0) size 215x21
+      RenderText {#text} at (111,126) size 215x21
+        text run at (111,126) width 215: "new block formating context"
+    RenderText {#text} at (0,147) size 215x21
+      text run at (0,147) width 215: "thanks to the CSS declaration "
+    RenderInline {CODE} at (0,0) size 94x17
+      RenderText {#text} at (215,150) size 94x17
+        text run at (215,150) width 94: "overflow: hidden"
+    RenderText {#text} at (309,147) size 4x21
+      text run at (309,147) width 4: ";"
+    RenderBR {BR} at (313,147) size 0x21
+    RenderText {#text} at (0,168) size 362x21
+      text run at (0,168) width 362: "\x{2013} has a 100px left margin and a 100px right margin;"
+layer at (8,1466) size 768x200
+  RenderBlock {DIV} at (0,1447) size 768x200 [bgcolor=#C0C0C0]
+    RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
+      RenderText {#text} at (36,36) size 117x84
+        text run at (36,36) width 81: "This yellow"
+        text run at (36,57) width 117: "square is floated"
+        text run at (36,78) width 116: "left and it has no"
+        text run at (36,99) width 53: "margin."
+    RenderBlock (floating) {DIV} at (568,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
+      RenderText {#text} at (36,36) size 126x84
+        text run at (36,36) width 81: "This yellow"
+        text run at (36,57) width 78: "square is a"
+        text run at (36,78) width 126: "floated right and it"
+        text run at (36,99) width 105: "has no margin."
+layer at (208,1466) size 368x189
+  RenderBlock {DIV} at (200,0) size 368x189 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 159x21
+      text run at (0,0) width 159: "This orange rectangle:"
+    RenderBR {BR} at (159,0) size 0x21
+    RenderText {#text} at (0,21) size 111x21
+      text run at (0,21) width 111: "\x{2013} establishes a "
+    RenderInline {STRONG} at (0,0) size 215x21
+      RenderText {#text} at (111,21) size 215x21
+        text run at (111,21) width 215: "new block formating context"
+    RenderText {#text} at (0,42) size 215x21
+      text run at (0,42) width 215: "thanks to the CSS declaration "
+    RenderInline {CODE} at (0,0) size 94x17
+      RenderText {#text} at (215,45) size 94x17
+        text run at (215,45) width 94: "overflow: hidden"
+    RenderText {#text} at (309,42) size 4x21
+      text run at (309,42) width 4: ";"
+    RenderBR {BR} at (313,42) size 0x21
+    RenderText {#text} at (0,63) size 192x21
+      text run at (0,63) width 192: "\x{2013} has a 200px right margin;"
+    RenderBR {BR} at (192,63) size 0x21
+    RenderBR {BR} at (0,84) size 0x21
+    RenderText {#text} at (0,105) size 159x21
+      text run at (0,105) width 159: "This orange rectangle:"
+    RenderBR {BR} at (159,105) size 0x21
+    RenderText {#text} at (0,126) size 111x21
+      text run at (0,126) width 111: "\x{2013} establishes a "
+    RenderInline {STRONG} at (0,0) size 215x21
+      RenderText {#text} at (111,126) size 215x21
+        text run at (111,126) width 215: "new block formating context"
+    RenderText {#text} at (0,147) size 215x21
+      text run at (0,147) width 215: "thanks to the CSS declaration "
+    RenderInline {CODE} at (0,0) size 94x17
+      RenderText {#text} at (215,150) size 94x17
+        text run at (215,150) width 94: "overflow: hidden"
+    RenderText {#text} at (309,147) size 4x21
+      text run at (309,147) width 4: ";"
+    RenderBR {BR} at (313,147) size 0x21
+    RenderText {#text} at (0,168) size 192x21
+      text run at (0,168) width 192: "\x{2013} has a 200px right margin;"
+layer at (8,1815) size 768x357
+  RenderBlock {DIV} at (0,1796) size 768x357 [bgcolor=#C0C0C0]
+    RenderBlock (floating) {DIV} at (0,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
+      RenderText {#text} at (36,36) size 117x105
+        text run at (36,36) width 81: "This yellow"
+        text run at (36,57) width 117: "square is floated"
+        text run at (36,78) width 107: "left and it has a"
+        text run at (36,99) width 101: "right margin of"
+        text run at (36,120) width 48: "100px."
+    RenderBlock (floating) {DIV} at (568,0) size 200x200 [bgcolor=#FFFF00] [border: (4px solid #008000)]
+      RenderText {#text} at (36,36) size 117x105
+        text run at (36,36) width 81: "This yellow"
+        text run at (36,57) width 117: "square is floated"
+        text run at (36,78) width 117: "right and it has a"
+        text run at (36,99) width 91: "left margin of"
+        text run at (36,120) width 48: "100px."
+layer at (308,1815) size 168x357
+  RenderBlock {DIV} at (300,0) size 168x357 [bgcolor=#FFA500]
+    RenderText {#text} at (0,0) size 159x21
+      text run at (0,0) width 159: "This orange rectangle:"
+    RenderBR {BR} at (159,0) size 0x21
+    RenderText {#text} at (0,21) size 111x21
+      text run at (0,21) width 111: "\x{2013} establishes a "
+    RenderInline {STRONG} at (0,0) size 142x63
+      RenderText {#text} at (111,21) size 142x63
+        text run at (111,21) width 31: "new"
+        text run at (0,42) width 119: "block formating"
+        text run at (0,63) width 57: "context"
+    RenderText {#text} at (57,63) size 151x42
+      text run at (57,63) width 94: " thanks to the"
+      text run at (0,84) width 117: "CSS declaration"
+    RenderInline {CODE} at (0,0) size 94x17
+      RenderText {#text} at (0,108) size 94x17
+        text run at (0,108) width 94: "overflow: hidden"
+    RenderText {#text} at (94,105) size 4x21
+      text run at (94,105) width 4: ";"
+    RenderBR {BR} at (98,105) size 0x21
+    RenderText {#text} at (0,126) size 162x42
+      text run at (0,126) width 160: "\x{2013} has a 0px left margin"
+      text run at (0,147) width 162: "and a 0px right margin;"
+    RenderBR {BR} at (162,147) size 0x21
+    RenderBR {BR} at (0,168) size 0x21
+    RenderText {#text} at (0,189) size 159x21
+      text run at (0,189) width 159: "This orange rectangle:"
+    RenderBR {BR} at (159,189) size 0x21
+    RenderText {#text} at (0,210) size 111x21
+      text run at (0,210) width 111: "\x{2013} establishes a "
+    RenderInline {STRONG} at (0,0) size 142x63
+      RenderText {#text} at (111,210) size 142x63
+        text run at (111,210) width 31: "new"
+        text run at (0,231) width 119: "block formating"
+        text run at (0,252) width 57: "context"
+    RenderText {#text} at (57,252) size 151x42
+      text run at (57,252) width 94: " thanks to the"
+      text run at (0,273) width 117: "CSS declaration"
+    RenderInline {CODE} at (0,0) size 94x17
+      RenderText {#text} at (0,297) size 94x17
+        text run at (0,297) width 94: "overflow: hidden"
+    RenderText {#text} at (94,294) size 4x21
+      text run at (94,294) width 4: ";"
+    RenderBR {BR} at (98,294) size 0x21
+    RenderText {#text} at (0,315) size 162x42
+      text run at (0,315) width 160: "\x{2013} has a 0px left margin"
+      text run at (0,336) width 162: "and a 0px right margin;"

diff --git a/LayoutTests/platform/qt/fast/dom/prototype-inheritance-2-expected.txt b/LayoutTests/platform/qt/fast/dom/prototype-inheritance-2-expected.txt
index 2a836ad..61af689 100644 (file)
--- a/LayoutTests/platform/qt/fast/dom/prototype-inheritance-2-expected.txt
+++ b/LayoutTests/platform/qt/fast/dom/prototype-inheritance-2-expected.txt
@@ -81,9 +81,6 @@ PASS DOMStringMapPrototype from inner.document.forms.testForm.0.dataset.__proto_
 PASS DOMTokenList from inner.document.forms.testForm.0.0.classList
 PASS DOMTokenListConstructor from inner.document.forms.testForm.0.classList.constructor
 PASS DOMTokenListPrototype from inner.document.forms.testForm.0.0.classList.__proto__
-PASS Window from inner
-PASS WindowConstructor from inner.document.forms.testForm.0.ownerDocument.defaultView.constructor
-PASS WindowPrototype from inner.document.forms.testForm.0.ownerDocument.defaultView.__proto__
 PASS DocumentPrototype from inner.document.forms.testForm.0.ownerDocument.__proto__.__proto__
 PASS ElementPrototype from inner.document.forms.testForm.0.__proto__.__proto__.__proto__
 PASS Function from inner.document.createElement
@@ -232,6 +229,9 @@ PASS WebKitCSSKeyframeRulePrototype from inner.document.getElementById("dummySty
 PASS WebKitCSSKeyframesRule from inner.document.getElementById("dummyStyle").sheet.cssRules.6
 PASS WebKitCSSKeyframesRuleConstructor from inner.document.getElementById("dummyStyle").sheet.cssRules.6.constructor
 PASS WebKitCSSKeyframesRulePrototype from inner.document.getElementById("dummyStyle").sheet.cssRules.6.__proto__
+PASS Window from inner
+PASS WindowConstructor from inner.document.forms.testForm.0.ownerDocument.defaultView.constructor
+PASS WindowPrototype from inner.document.forms.testForm.0.ownerDocument.defaultView.__proto__
 Never found Audio
 Never found Blob
 Never found CDATASection

diff --git a/LayoutTests/platform/qt/fast/js/global-constructors-expected.png b/LayoutTests/platform/qt/fast/js/global-constructors-expected.png
index 857bd6b..224d7aa 100644 (file)
Binary files a/LayoutTests/platform/qt/fast/js/global-constructors-expected.png and b/LayoutTests/platform/qt/fast/js/global-constructors-expected.png differ

diff --git a/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt b/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt
index c91dfbc..cd75f7f 100644 (file)
--- a/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt
+++ b/LayoutTests/platform/qt/fast/js/global-constructors-expected.txt
@@ -304,7 +304,7 @@ PASS WebKitPoint.toString() is '[object WebKitPointConstructor]'
 PASS WebKitTransitionEvent.toString() is '[object WebKitTransitionEventConstructor]'
 PASS WebSocket.toString() is '[object WebSocketConstructor]'
 PASS WheelEvent.toString() is '[object WheelEventConstructor]'
-FAIL Window.toString() should be [object WindowConstructor]. Was [object WindowConstructor].
+PASS Window.toString() is '[object WindowConstructor]'
 PASS Worker.toString() is '[object WorkerConstructor]'
 PASS XMLDocument.toString() is '[object DocumentConstructor]'
 PASS XMLHttpRequest.toString() is '[object XMLHttpRequestConstructor]'

diff --git a/LayoutTests/platform/qt/fast/repaint/region-painting-invalidation-expected.png b/LayoutTests/platform/qt/fast/repaint/region-painting-invalidation-expected.png
new file mode 100644 (file)
index 0000000..a09b209
Binary files /dev/null and b/LayoutTests/platform/qt/fast/repaint/region-painting-invalidation-expected.png differ

diff --git a/LayoutTests/platform/qt/fast/repaint/region-painting-invalidation-expected.txt b/LayoutTests/platform/qt/fast/repaint/region-painting-invalidation-expected.txt
new file mode 100644 (file)
index 0000000..7225be5
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/repaint/region-painting-invalidation-expected.txt
@@ -0,0 +1,18 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderRegion {DIV} at (0,0) size 302x152 [bgcolor=#FF0000] [border: (1px solid #000000)]
+      RenderBlock (anonymous) at (0,152) size 784x21
+        RenderBR {BR} at (0,0) size 0x21
+      RenderRegion {DIV} at (0,173) size 302x202 [bgcolor=#FF0000] [border: (1px solid #000000)]
+Flow Threads
+  Thread with flow-name 'flow1'
+    layer at (0,0) size 300x350
+      RenderFlowThread at (0,0) size 300x350
+        RenderBlock {DIV} at (0,0) size 300x350
+          RenderBlock {DIV} at (0,0) size 300x350 [bgcolor=#008000]
+  Regions for flow 'flow1'
+    RenderRegion {DIV} #region1
+    RenderRegion {DIV} #region2

diff --git a/LayoutTests/platform/qt/svg/carto.net/window-expected.png b/LayoutTests/platform/qt/svg/carto.net/window-expected.png
index 9b4bd77..cd84293 100644 (file)
Binary files a/LayoutTests/platform/qt/svg/carto.net/window-expected.png and b/LayoutTests/platform/qt/svg/carto.net/window-expected.png differ

diff --git a/LayoutTests/platform/qt/svg/carto.net/window-expected.txt b/LayoutTests/platform/qt/svg/carto.net/window-expected.txt
index 2638a06..f0281c1 100644 (file)
--- a/LayoutTests/platform/qt/svg/carto.net/window-expected.txt
+++ b/LayoutTests/platform/qt/svg/carto.net/window-expected.txt
@@ -56,43 +56,43 @@ layer at (0,0) size 800x600
     RenderSVGText {text} at (408,43) size 144x16 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 144x16
         chunk 1 (middle anchor) text run 1 at (408.32,55.00) startOffset 0 endOffset 24 width 143.36: "Resize Navigation Window"
-    RenderSVGContainer {g} at (38,81) size 760x454
+    RenderSVGContainer {g} at (38,81) size 760x455
       RenderSVGContainer {g} at (613,81) size 185x169 [transform={m=((1.00,0.00)(0.00,1.00)) t=(800.00,85.00)}]
         RenderSVGContainer {g} at (624,92) size 174x158
           RenderSVGRect {rect} at (624,92) size 174x158 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F0F8FF]}] [x=0.00] [y=0.00] [width=220.00] [height=200.00]
-          RenderSVGContainer {g} at (632,101) size 163x99
-            RenderSVGText {text} at (10,11) size 207x126 contains 1 chunk(s)
-              RenderSVGInlineText {#text} at (0,0) size 124x18
-                chunk 1 text run 1 at (10.00,25.00) startOffset 0 endOffset 18 width 124.00: "This window should"
-              RenderSVGTSpan {tspan} at (0,0) size 149x18
-                RenderSVGInlineText {#text} at (0,16) size 149x18
-                  chunk 1 text run 1 at (10.00,41.00) startOffset 0 endOffset 24 width 149.00: "contain navigation tools"
-              RenderSVGTSpan {tspan} at (0,0) size 94x18
-                RenderSVGInlineText {#text} at (0,38) size 94x18
-                  chunk 1 text run 1 at (10.00,63.00) startOffset 0 endOffset 15 width 94.00: "Click on button"
-              RenderSVGTSpan {tspan} at (0,0) size 207x18
-                RenderSVGInlineText {#text} at (0,54) size 207x18
-                  chunk 1 text run 1 at (10.00,79.00) startOffset 0 endOffset 32 width 207.00: "'Resize Navigation Window' for a"
-              RenderSVGTSpan {tspan} at (0,0) size 187x18
-                RenderSVGInlineText {#text} at (0,70) size 187x18
-                  chunk 1 text run 1 at (10.00,95.00) startOffset 0 endOffset 28 width 187.00: "random resize of this Window"
-              RenderSVGTSpan {tspan} at (0,0) size 165x18
-                RenderSVGInlineText {#text} at (0,92) size 165x18
-                  chunk 1 text run 1 at (10.00,117.00) startOffset 0 endOffset 26 width 165.00: "Note that this window also"
-              RenderSVGTSpan {tspan} at (0,0) size 186x18
-                RenderSVGInlineText {#text} at (0,108) size 186x18
-                  chunk 1 text run 1 at (10.00,133.00) startOffset 0 endOffset 28 width 186.00: "features a window decoration"
+          RenderSVGContainer {g} at (632,100) size 160x102
+            RenderSVGText {text} at (10,10) size 203x128 contains 1 chunk(s)
+              RenderSVGInlineText {#text} at (0,0) size 122x20
+                chunk 1 text run 1 at (10.00,25.00) startOffset 0 endOffset 18 width 121.60: "This window should"
+              RenderSVGTSpan {tspan} at (0,0) size 145x20
+                RenderSVGInlineText {#text} at (0,16) size 145x20
+                  chunk 1 text run 1 at (10.00,41.00) startOffset 0 endOffset 24 width 144.64: "contain navigation tools"
+              RenderSVGTSpan {tspan} at (0,0) size 93x20
+                RenderSVGInlineText {#text} at (0,38) size 93x20
+                  chunk 1 text run 1 at (10.00,63.00) startOffset 0 endOffset 15 width 92.16: "Click on button"
+              RenderSVGTSpan {tspan} at (0,0) size 203x20
+                RenderSVGInlineText {#text} at (0,54) size 203x20
+                  chunk 1 text run 1 at (10.00,79.00) startOffset 0 endOffset 32 width 202.24: "'Resize Navigation Window' for a"
+              RenderSVGTSpan {tspan} at (0,0) size 184x20
+                RenderSVGInlineText {#text} at (0,70) size 184x20
+                  chunk 1 text run 1 at (10.00,95.00) startOffset 0 endOffset 28 width 183.04: "random resize of this Window"
+              RenderSVGTSpan {tspan} at (0,0) size 162x20
+                RenderSVGInlineText {#text} at (0,92) size 162x20
+                  chunk 1 text run 1 at (10.00,117.00) startOffset 0 endOffset 26 width 161.28: "Note that this window also"
+              RenderSVGTSpan {tspan} at (0,0) size 182x20
+                RenderSVGInlineText {#text} at (0,108) size 182x20
+                  chunk 1 text run 1 at (10.00,133.00) startOffset 0 endOffset 28 width 181.76: "features a window decoration"
           RenderSVGRect {rect} at (624,238) size 174x12 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F0F8FF]}] [x=0.00] [y=187.00] [width=220.00] [height=13.00]
-          RenderSVGText {text} at (3,187) size 45x13 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (0,0) size 45x13
-              chunk 1 text run 1 at (3.00,197.00) startOffset 0 endOffset 9 width 45.00: "Statusbar"
+          RenderSVGText {text} at (3,186) size 41x15 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,0) size 41x15
+              chunk 1 text run 1 at (3.00,197.00) startOffset 0 endOffset 9 width 40.96: "Statusbar"
         RenderSVGContainer {g} at (613,81) size 185x159
           RenderSVGContainer {g} at (613,81) size 185x159
             RenderSVGRect {rect} at (613,81) size 16x159 [fill={[type=SOLID] [color=#B0C4DE]}] [x=-15.00] [y=-15.00] [width=20.00] [height=202.00]
             RenderSVGRect {rect} at (613,81) size 185x16 [fill={[type=SOLID] [color=#B0C4DE]}] [x=-15.00] [y=-15.00] [width=236.00] [height=20.00]
-            RenderSVGText {text} at (0,168) size 106x16 contains 1 chunk(s)
-              RenderSVGInlineText {#text} at (0,0) size 106x16
-                chunk 1 text run 1 at (0.00,180.00) startOffset 0 endOffset 17 width 106.00: "Navigation Window"
+            RenderSVGText {text} at (0,168) size 103x16 contains 1 chunk(s)
+              RenderSVGInlineText {#text} at (0,0) size 103x16
+                chunk 1 text run 1 at (0.00,180.00) startOffset 0 endOffset 17 width 102.40: "Navigation Window"
           RenderSVGContainer {use} at (616,84) size 10x10
             RenderSVGContainer {g} at (616,84) size 10x10 [transform={m=((1.00,0.00)(0.00,1.00)) t=(-5.00,-5.00)}]
               RenderSVGViewportContainer {svg} at (616,84) size 10x10
@@ -108,35 +108,35 @@ layer at (0,0) size 800x600
               RenderSVGViewportContainer {svg} at (616,116) size 10x9
                 RenderSVGRect {rect} at (616,116) size 10x9 [x=-5.50] [y=-5.50] [width=11.00] [height=11.00]
                 RenderSVGPath {line} at (616,124) size 10x1 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#000000]}] [x1=5.50] [y1=5.50] [x2=-5.50] [y2=5.50]
-      RenderSVGContainer {g} at (38,143) size 549x392 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,150.00)}]
-        RenderSVGContainer {g} at (38,143) size 549x392
+      RenderSVGContainer {g} at (38,142) size 549x394 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,150.00)}]
+        RenderSVGContainer {g} at (38,143) size 549x393
           RenderSVGRect {rect} at (38,143) size 549x392 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F0F8FF]}] [x=0.00] [y=0.00] [width=700.00] [height=500.00]
           RenderSVGContainer {g} at (0,0) size 0x0
           RenderSVGRect {rect} at (38,523) size 549x12 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F0F8FF]}] [x=0.00] [y=487.00] [width=700.00] [height=13.00]
-          RenderSVGText {text} at (3,487) size 134x13 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (0,0) size 134x13
-              chunk 1 text run 1 at (3.00,497.00) startOffset 0 endOffset 28 width 134.00: "This is a big movable window"
+          RenderSVGText {text} at (3,486) size 128x15 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,0) size 128x15
+              chunk 1 text run 1 at (3.00,497.00) startOffset 0 endOffset 28 width 128.00: "This is a big movable window"
           RenderSVGContainer {g} at (77,182) size 315x236 [transform={m=((1.00,0.00)(0.00,1.00)) t=(50.00,50.00)}]
             RenderSVGContainer {g} at (77,182) size 315x236
               RenderSVGRect {rect} at (77,182) size 315x236 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F0F8FF]}] [x=0.00] [y=0.00] [width=400.00] [height=300.00]
               RenderSVGContainer {g} at (0,0) size 0x0
               RenderSVGRect {rect} at (77,406) size 315x12 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F0F8FF]}] [x=0.00] [y=287.00] [width=400.00] [height=13.00]
-              RenderSVGText {text} at (3,287) size 167x13 contains 1 chunk(s)
-                RenderSVGInlineText {#text} at (0,0) size 167x13
-                  chunk 1 text run 1 at (3.00,297.00) startOffset 0 endOffset 34 width 167.00: "This window contains other windows"
+              RenderSVGText {text} at (3,286) size 159x15 contains 1 chunk(s)
+                RenderSVGInlineText {#text} at (0,0) size 159x15
+                  chunk 1 text run 1 at (3.00,297.00) startOffset 0 endOffset 34 width 158.72: "This window contains other windows"
               RenderSVGContainer {g} at (77,195) size 174x143 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,17.00)}]
                 RenderSVGContainer {g} at (77,195) size 174x143
                   RenderSVGRect {rect} at (77,195) size 174x143 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F0F8FF]}] [x=0.00] [y=0.00] [width=220.00] [height=180.00]
                   RenderSVGContainer {g} at (0,0) size 0x0
                   RenderSVGRect {rect} at (77,326) size 174x12 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F0F8FF]}] [x=0.00] [y=167.00] [width=220.00] [height=13.00]
-                  RenderSVGText {text} at (3,167) size 186x13 contains 1 chunk(s)
-                    RenderSVGInlineText {#text} at (0,0) size 186x13
-                      chunk 1 text run 1 at (3.00,177.00) startOffset 0 endOffset 36 width 186.00: "Changing a colour changes background"
-                RenderSVGContainer {g} at (77,195) size 174x16
+                  RenderSVGText {text} at (3,166) size 169x15 contains 1 chunk(s)
+                    RenderSVGInlineText {#text} at (0,0) size 169x15
+                      chunk 1 text run 1 at (3.00,177.00) startOffset 0 endOffset 36 width 168.96: "Changing a colour changes background"
+                RenderSVGContainer {g} at (77,195) size 174x17
                   RenderSVGRect {rect} at (77,195) size 174x15 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#DCDCDC]}] [x=0.00] [y=0.00] [width=220.00] [height=17.00]
-                  RenderSVGText {text} at (3,0) size 85x18 contains 1 chunk(s)
-                    RenderSVGInlineText {#text} at (0,0) size 85x18
-                      chunk 1 text run 1 at (3.00,14.00) startOffset 0 endOffset 13 width 85.00: "Colour Picker"
+                  RenderSVGText {text} at (3,-1) size 85x20 contains 1 chunk(s)
+                    RenderSVGInlineText {#text} at (0,0) size 85x20
+                      chunk 1 text run 1 at (3.00,14.00) startOffset 0 endOffset 13 width 84.48: "Colour Picker"
                   RenderSVGContainer {use} at (236,198) size 10x10
                     RenderSVGContainer {g} at (236,198) size 10x10 [transform={m=((1.00,0.00)(0.00,1.00)) t=(208.50,8.50)}]
                       RenderSVGViewportContainer {svg} at (236,198) size 10x10
@@ -152,24 +152,24 @@ layer at (0,0) size 800x600
                       RenderSVGViewportContainer {svg} at (210,198) size 9x10
                         RenderSVGRect {rect} at (210,198) size 9x10 [x=-5.50] [y=-5.50] [width=11.00] [height=11.00]
                         RenderSVGPath {line} at (210,206) size 9x2 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#000000]}] [x1=5.50] [y1=5.50] [x2=-5.50] [y2=5.50]
-              RenderSVGContainer {g} at (249,344) size 143x64 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,207.00)}]
+              RenderSVGContainer {g} at (249,343) size 143x65 [transform={m=((1.00,0.00)(0.00,1.00)) t=(220.00,207.00)}]
                 RenderSVGContainer {g} at (249,344) size 143x64
                   RenderSVGRect {rect} at (249,344) size 143x64 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F0F8FF]}] [x=0.00] [y=0.00] [width=180.00] [height=80.00]
-                  RenderSVGContainer {g} at (257,364) size 123x40
-                    RenderSVGText {text} at (10,26) size 156x50 contains 1 chunk(s)
-                      RenderSVGInlineText {#text} at (0,0) size 156x18
-                        chunk 1 text run 1 at (10.00,40.00) startOffset 0 endOffset 23 width 156.00: "This is a none-moveable"
-                      RenderSVGTSpan {tspan} at (0,0) size 139x18
-                        RenderSVGInlineText {#text} at (0,16) size 139x18
-                          chunk 1 text run 1 at (10.00,56.00) startOffset 0 endOffset 21 width 139.00: "none-closeable status"
-                      RenderSVGTSpan {tspan} at (0,0) size 47x18
-                        RenderSVGInlineText {#text} at (0,32) size 47x18
-                          chunk 1 text run 1 at (10.00,72.00) startOffset 0 endOffset 6 width 47.00: "window"
-                RenderSVGContainer {g} at (249,344) size 143x15
+                  RenderSVGContainer {g} at (257,364) size 121x42
+                    RenderSVGText {text} at (10,25) size 153x52 contains 1 chunk(s)
+                      RenderSVGInlineText {#text} at (0,0) size 153x20
+                        chunk 1 text run 1 at (10.00,40.00) startOffset 0 endOffset 23 width 152.32: "This is a none-moveable"
+                      RenderSVGTSpan {tspan} at (0,0) size 137x21
+                        RenderSVGInlineText {#text} at (0,15) size 137x20
+                          chunk 1 text run 1 at (10.00,56.00) startOffset 0 endOffset 21 width 136.96: "none-closeable status"
+                      RenderSVGTSpan {tspan} at (0,0) size 47x21
+                        RenderSVGInlineText {#text} at (0,31) size 47x20
+                          chunk 1 text run 1 at (10.00,72.00) startOffset 0 endOffset 6 width 46.08: "window"
+                RenderSVGContainer {g} at (249,343) size 143x18
                   RenderSVGRect {rect} at (249,344) size 143x15 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#DCDCDC]}] [x=0.00] [y=0.00] [width=180.00] [height=17.00]
-                  RenderSVGText {text} at (3,0) size 94x18 contains 1 chunk(s)
-                    RenderSVGInlineText {#text} at (0,0) size 94x18
-                      chunk 1 text run 1 at (3.00,14.00) startOffset 0 endOffset 13 width 94.00: "Status Window"
+                  RenderSVGText {text} at (3,-1) size 93x20 contains 1 chunk(s)
+                    RenderSVGInlineText {#text} at (0,0) size 93x20
+                      chunk 1 text run 1 at (3.00,14.00) startOffset 0 endOffset 13 width 92.16: "Status Window"
                   RenderSVGContainer {use} at (376,346) size 11x10
                     RenderSVGContainer {g} at (376,346) size 11x10 [transform={m=((1.00,0.00)(0.00,1.00)) t=(168.50,8.50)}]
                       RenderSVGViewportContainer {svg} at (376,346) size 11x10
@@ -179,11 +179,11 @@ layer at (0,0) size 800x600
                       RenderSVGViewportContainer {svg} at (364,346) size 9x10
                         RenderSVGRect {rect} at (364,346) size 9x10 [x=-5.50] [y=-5.50] [width=11.00] [height=11.00]
                         RenderSVGPath {line} at (364,355) size 9x1 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#000000]}] [x1=5.50] [y1=5.50] [x2=-5.50] [y2=5.50]
-            RenderSVGContainer {g} at (77,182) size 315x15
+            RenderSVGContainer {g} at (77,182) size 315x17
               RenderSVGRect {rect} at (77,182) size 315x15 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#DCDCDC]}] [x=0.00] [y=0.00] [width=400.00] [height=17.00]
-              RenderSVGText {text} at (3,0) size 170x18 contains 1 chunk(s)
-                RenderSVGInlineText {#text} at (0,0) size 170x18
-                  chunk 1 text run 1 at (3.00,14.00) startOffset 0 endOffset 24 width 170.00: "Nested middlesize Window"
+              RenderSVGText {text} at (3,-1) size 167x20 contains 1 chunk(s)
+                RenderSVGInlineText {#text} at (0,0) size 167x20
+                  chunk 1 text run 1 at (3.00,14.00) startOffset 0 endOffset 24 width 166.40: "Nested middlesize Window"
               RenderSVGContainer {use} at (377,184) size 10x11
                 RenderSVGContainer {g} at (377,184) size 10x11 [transform={m=((1.00,0.00)(0.00,1.00)) t=(388.50,8.50)}]
                   RenderSVGViewportContainer {svg} at (377,184) size 10x11
@@ -202,31 +202,31 @@ layer at (0,0) size 800x600
           RenderSVGContainer {g} at (312,377) size 158x143 [transform={m=((1.00,0.00)(0.00,1.00)) t=(350.00,300.00)}]
             RenderSVGContainer {g} at (312,377) size 158x143
               RenderSVGRect {rect} at (312,377) size 158x143 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F0F8FF]}] [x=0.00] [y=0.00] [width=200.00] [height=180.00]
-              RenderSVGContainer {g} at (320,398) size 138x65
-                RenderSVGText {text} at (10,26) size 176x82 contains 1 chunk(s)
-                  RenderSVGInlineText {#text} at (0,0) size 172x18
-                    chunk 1 text run 1 at (10.00,40.00) startOffset 0 endOffset 26 width 172.00: "This window has a callback"
-                  RenderSVGTSpan {tspan} at (0,0) size 161x18
-                    RenderSVGInlineText {#text} at (0,16) size 161x18
-                      chunk 1 text run 1 at (10.00,56.00) startOffset 0 endOffset 25 width 161.00: "function indicating mouse"
-                  RenderSVGTSpan {tspan} at (0,0) size 176x18
-                    RenderSVGInlineText {#text} at (0,32) size 176x18
-                      chunk 1 text run 1 at (10.00,72.00) startOffset 0 endOffset 26 width 176.00: "movements in the statusbar"
-                  RenderSVGTSpan {tspan} at (0,0) size 126x18
-                    RenderSVGInlineText {#text} at (0,48) size 126x18
-                      chunk 1 text run 1 at (10.00,88.00) startOffset 0 endOffset 19 width 126.00: "and alerting window"
-                  RenderSVGTSpan {tspan} at (0,0) size 42x18
-                    RenderSVGInlineText {#text} at (0,64) size 42x18
-                      chunk 1 text run 1 at (10.00,104.00) startOffset 0 endOffset 6 width 42.00: "events"
+              RenderSVGContainer {g} at (320,397) size 136x68
+                RenderSVGText {text} at (10,25) size 173x84 contains 1 chunk(s)
+                  RenderSVGInlineText {#text} at (0,0) size 171x20
+                    chunk 1 text run 1 at (10.00,40.00) startOffset 0 endOffset 26 width 170.24: "This window has a callback"
+                  RenderSVGTSpan {tspan} at (0,0) size 157x21
+                    RenderSVGInlineText {#text} at (0,15) size 157x20
+                      chunk 1 text run 1 at (10.00,56.00) startOffset 0 endOffset 25 width 156.16: "function indicating mouse"
+                  RenderSVGTSpan {tspan} at (0,0) size 173x21
+                    RenderSVGInlineText {#text} at (0,31) size 173x20
+                      chunk 1 text run 1 at (10.00,72.00) startOffset 0 endOffset 26 width 172.80: "movements in the statusbar"
+                  RenderSVGTSpan {tspan} at (0,0) size 122x20
+                    RenderSVGInlineText {#text} at (0,48) size 122x20
+                      chunk 1 text run 1 at (10.00,88.00) startOffset 0 endOffset 19 width 121.60: "and alerting window"
+                  RenderSVGTSpan {tspan} at (0,0) size 43x20
+                    RenderSVGInlineText {#text} at (0,64) size 43x20
+                      chunk 1 text run 1 at (10.00,104.00) startOffset 0 endOffset 6 width 42.24: "events"
               RenderSVGRect {rect} at (312,508) size 158x12 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F0F8FF]}] [x=0.00] [y=167.00] [width=200.00] [height=13.00]
-              RenderSVGText {text} at (3,167) size 119x13 contains 1 chunk(s)
-                RenderSVGInlineText {#text} at (0,0) size 119x13
-                  chunk 1 text run 1 at (3.00,177.00) startOffset 0 endOffset 27 width 119.00: "Callback function is active"
-            RenderSVGContainer {g} at (312,377) size 158x16
+              RenderSVGText {text} at (3,166) size 113x15 contains 1 chunk(s)
+                RenderSVGInlineText {#text} at (0,0) size 113x15
+                  chunk 1 text run 1 at (3.00,177.00) startOffset 0 endOffset 27 width 112.64: "Callback function is active"
+            RenderSVGContainer {g} at (312,377) size 158x17
               RenderSVGRect {rect} at (312,377) size 158x15 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#DCDCDC]}] [x=0.00] [y=0.00] [width=200.00] [height=17.00]
-              RenderSVGText {text} at (3,0) size 89x18 contains 1 chunk(s)
-                RenderSVGInlineText {#text} at (0,0) size 89x18
-                  chunk 1 text run 1 at (3.00,14.00) startOffset 0 endOffset 12 width 89.00: "Small Window"
+              RenderSVGText {text} at (3,-1) size 86x20 contains 1 chunk(s)
+                RenderSVGInlineText {#text} at (0,0) size 86x20
+                  chunk 1 text run 1 at (3.00,14.00) startOffset 0 endOffset 12 width 85.76: "Small Window"
               RenderSVGContainer {use} at (455,380) size 10x10
                 RenderSVGContainer {g} at (455,380) size 10x10 [transform={m=((1.00,0.00)(0.00,1.00)) t=(188.50,8.50)}]
                   RenderSVGViewportContainer {svg} at (455,380) size 10x10
@@ -245,22 +245,22 @@ layer at (0,0) size 800x600
           RenderSVGContainer {g} at (39,476) size 119x48 [transform={m=((1.00,0.00)(0.00,1.00)) t=(1.00,426.00)}]
             RenderSVGContainer {g} at (39,476) size 119x48
               RenderSVGRect {rect} at (39,476) size 119x48 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#F0F8FF]}] [x=0.00] [y=0.00] [width=150.00] [height=60.00]
-              RenderSVGContainer {g} at (43,479) size 114x39
-                RenderSVGText {text} at (5,4) size 144x48 contains 1 chunk(s)
-                  RenderSVGInlineText {#text} at (0,0) size 136x16
-                    chunk 1 text run 1 at (5.00,16.00) startOffset 0 endOffset 24 width 136.00: "This is a minimal window"
-                  RenderSVGTSpan {tspan} at (0,0) size 144x16
-                    RenderSVGInlineText {#text} at (0,16) size 144x16
-                      chunk 1 text run 1 at (5.00,32.00) startOffset 0 endOffset 29 width 144.00: "without title and status bar."
+              RenderSVGContainer {g} at (43,479) size 115x39
+                RenderSVGText {text} at (5,4) size 146x48 contains 1 chunk(s)
+                  RenderSVGInlineText {#text} at (0,0) size 135x16
+                    chunk 1 text run 1 at (5.00,16.00) startOffset 0 endOffset 24 width 134.40: "This is a minimal window"
+                  RenderSVGTSpan {tspan} at (0,0) size 146x16
+                    RenderSVGInlineText {#text} at (0,16) size 146x16
+                      chunk 1 text run 1 at (5.00,32.00) startOffset 0 endOffset 29 width 145.92: "without title and status bar."
                   RenderSVGTSpan {tspan} at (0,0) size 121x16
                     RenderSVGInlineText {#text} at (0,32) size 121x16
-                      chunk 1 text run 1 at (5.00,48.00) startOffset 0 endOffset 23 width 121.00: "it is also not moveable"
+                      chunk 1 text run 1 at (5.00,48.00) startOffset 0 endOffset 23 width 120.32: "it is also not moveable"
             RenderSVGContainer {g} at (0,0) size 0x0
-        RenderSVGContainer {g} at (38,143) size 549x15
+        RenderSVGContainer {g} at (38,142) size 549x18
           RenderSVGRect {rect} at (38,143) size 549x15 [stroke={[type=SOLID] [color=#696969]}] [fill={[type=SOLID] [color=#DCDCDC]}] [x=0.00] [y=0.00] [width=700.00] [height=17.00]
-          RenderSVGText {text} at (3,0) size 74x18 contains 1 chunk(s)
-            RenderSVGInlineText {#text} at (0,0) size 74x18
-              chunk 1 text run 1 at (3.00,14.00) startOffset 0 endOffset 10 width 74.00: "Big Window"
+          RenderSVGText {text} at (3,-1) size 72x20 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,0) size 72x20
+              chunk 1 text run 1 at (3.00,14.00) startOffset 0 endOffset 10 width 71.68: "Big Window"
           RenderSVGContainer {use} at (572,145) size 10x10
             RenderSVGContainer {g} at (572,145) size 10x10 [transform={m=((1.00,0.00)(0.00,1.00)) t=(688.50,8.50)}]
               RenderSVGViewportContainer {svg} at (572,145) size 10x10

diff --git a/LayoutTests/platform/qt/svg/custom/js-late-clipPath-and-object-creation-expected.png b/LayoutTests/platform/qt/svg/custom/js-late-clipPath-and-object-creation-expected.png
index b09805a..3d76c97 100644 (file)
Binary files a/LayoutTests/platform/qt/svg/custom/js-late-clipPath-and-object-creation-expected.png and b/LayoutTests/platform/qt/svg/custom/js-late-clipPath-and-object-creation-expected.png differ

diff --git a/LayoutTests/platform/qt/svg/custom/js-late-clipPath-and-object-creation-expected.txt b/LayoutTests/platform/qt/svg/custom/js-late-clipPath-and-object-creation-expected.txt
index 2de44d7..bc8d7d8 100644 (file)
--- a/LayoutTests/platform/qt/svg/custom/js-late-clipPath-and-object-creation-expected.txt
+++ b/LayoutTests/platform/qt/svg/custom/js-late-clipPath-and-object-creation-expected.txt
@@ -3,10 +3,10 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderSVGRoot {svg} at (16,30) size 318x190
     RenderSVGContainer {g} at (16,30) size 318x190 [transform={m=((1.00,0.00)(0.00,1.50)) t=(0.00,0.00)}]
-      RenderSVGText {text} at (10,12) size 539x76 contains 1 chunk(s)
+      RenderSVGText {text} at (10,12) size 539x75 contains 1 chunk(s)
         [clipPath="dynClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 200x200
-        RenderSVGInlineText {#text} at (0,0) size 539x76
+        RenderSVGInlineText {#text} at (0,0) size 539x75
           [clipPath="dynClip"] RenderSVGResourceClipper {clipPath} at (0,0) size 200x200
-          chunk 1 text run 1 at (10.00,70.00) startOffset 0 endOffset 19 width 539.00: "Clipped. INVISIBLE."
+          chunk 1 text run 1 at (10.00,70.00) startOffset 0 endOffset 19 width 538.93: "Clipped. INVISIBLE."
       RenderSVGResourceClipper {clipPath} [id="dynClip"] [clipPathUnits=userSpaceOnUse]
         RenderSVGPath {path} at (0,0) size 334x500 [fill={[type=SOLID] [color=#000000]}] [data="M 0 0 L 200 0 L 200 200 L 0 200 Z"]

diff --git a/LayoutTests/platform/qt/svg/custom/js-late-gradient-and-object-creation-expected.png b/LayoutTests/platform/qt/svg/custom/js-late-gradient-and-object-creation-expected.png
index 0fec642..053d3c8 100644 (file)
Binary files a/LayoutTests/platform/qt/svg/custom/js-late-gradient-and-object-creation-expected.png and b/LayoutTests/platform/qt/svg/custom/js-late-gradient-and-object-creation-expected.png differ

diff --git a/LayoutTests/platform/qt/svg/custom/js-late-gradient-and-object-creation-expected.txt b/LayoutTests/platform/qt/svg/custom/js-late-gradient-and-object-creation-expected.txt
index f53e9f8..971e0ab 100644 (file)
--- a/LayoutTests/platform/qt/svg/custom/js-late-gradient-and-object-creation-expected.txt
+++ b/LayoutTests/platform/qt/svg/custom/js-late-gradient-and-object-creation-expected.txt
@@ -8,12 +8,12 @@ layer at (0,0) size 800x600
         RenderSVGGradientStop {stop} [offset=1.00] [color=#FF0000]
       RenderSVGResourceLinearGradient {linearGradient} [id="strokeLinearGradient"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,0)]
         RenderSVGGradientStop {stop} [offset=1.00] [color=#008000]
-      RenderSVGText {text} at (-150,5) size 440x85 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,0) size 440x85
-          chunk 1 text run 1 at (-150.00,70.00) startOffset 0 endOffset 16 width 440.00: "Gradient on fill"
-      RenderSVGText {text} at (-150,75) size 562x85 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,0) size 562x85
-          chunk 1 text run 1 at (-150.00,140.00) startOffset 0 endOffset 18 width 562.00: "Gradient on stroke"
-      RenderSVGText {text} at (-150,145) size 645x85 contains 1 chunk(s)
-        RenderSVGInlineText {#text} at (0,0) size 645x85
-          chunk 1 text run 1 at (-150.00,210.00) startOffset 0 endOffset 23 width 645.00: "Gradient on fill/stroke"
+      RenderSVGText {text} at (-150,5) size 437x85 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,0) size 437x85
+          chunk 1 text run 1 at (-150.00,70.00) startOffset 0 endOffset 16 width 436.80: "Gradient on fill"
+      RenderSVGText {text} at (-150,75) size 559x85 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,0) size 559x85
+          chunk 1 text run 1 at (-150.00,140.00) startOffset 0 endOffset 18 width 558.60: "Gradient on stroke"
+      RenderSVGText {text} at (-150,145) size 641x85 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,0) size 641x85
+          chunk 1 text run 1 at (-150.00,210.00) startOffset 0 endOffset 23 width 640.80: "Gradient on fill/stroke"

diff --git a/LayoutTests/platform/qt/svg/custom/pointer-events-text-css-transform-expected.png b/LayoutTests/platform/qt/svg/custom/pointer-events-text-css-transform-expected.png
index d5f2f38..0da8b7f 100644 (file)
Binary files a/LayoutTests/platform/qt/svg/custom/pointer-events-text-css-transform-expected.png and b/LayoutTests/platform/qt/svg/custom/pointer-events-text-css-transform-expected.png differ

diff --git a/LayoutTests/platform/qt/svg/custom/pointer-events-text-css-transform-expected.txt b/LayoutTests/platform/qt/svg/custom/pointer-events-text-css-transform-expected.txt
index 759a3a8..ac03ede 100644 (file)
--- a/LayoutTests/platform/qt/svg/custom/pointer-events-text-css-transform-expected.txt
+++ b/LayoutTests/platform/qt/svg/custom/pointer-events-text-css-transform-expected.txt
@@ -63,49 +63,49 @@ layer at (0,0) size 800x600
       RenderSVGText {text} at (0,101) size 101x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 101x21
           chunk 1 text run 1 at (0.00,117.00) startOffset 0 endOffset 14 width 101.00: "visiblePainted"
-      RenderSVGText {text} at (50,38) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (50,39) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (50.00,58.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (105,91) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (105.00,107.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (78,38) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (78,39) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (78.50,58.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (162,91) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (162.00,107.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (107,38) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (107,39) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (107.00,58.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (219,91) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (219.00,107.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (135,38) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (135,39) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (135.50,58.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (276,91) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (276.00,107.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (164,38) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (164,39) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (164.00,58.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (333,91) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (333.00,107.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (192,38) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (192,39) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (192.50,58.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (390,91) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (390.00,107.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (221,38) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (221,39) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (221.00,58.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (447,91) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (447.00,107.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (249,38) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (249,39) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (249.50,58.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (504,91) size 33x21 contains 1 chunk(s)
@@ -165,49 +165,49 @@ layer at (0,0) size 800x600
       RenderSVGText {text} at (0,215) size 92x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 92x21
           chunk 1 text run 1 at (0.00,231.00) startOffset 0 endOffset 13 width 92.00: "visibleStroke"
-      RenderSVGText {text} at (50,95) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (50,96) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (50.00,115.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (105,205) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (105.00,221.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (78,95) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (78,96) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (78.50,115.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (162,205) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (162.00,221.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (107,95) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (107,96) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (107.00,115.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (219,205) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (219.00,221.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (135,95) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (135,96) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (135.50,115.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (276,205) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (276.00,221.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (164,95) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (164,96) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (164.00,115.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (333,205) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (333.00,221.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (192,95) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (192,96) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (192.50,115.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (390,205) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (390.00,221.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (221,95) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (221,96) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (221.00,115.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (447,205) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (447.00,221.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (249,95) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (249,96) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (249.50,115.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (504,205) size 33x21 contains 1 chunk(s)
@@ -267,49 +267,49 @@ layer at (0,0) size 800x600
       RenderSVGText {text} at (0,329) size 53x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 53x21
           chunk 1 text run 1 at (0.00,345.00) startOffset 0 endOffset 7 width 53.00: "painted"
-      RenderSVGText {text} at (50,152) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (50,153) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (50.00,172.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (105,319) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (105.00,335.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (78,152) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (78,153) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (78.50,172.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (162,319) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (162.00,335.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (107,152) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (107,153) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (107.00,172.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (219,319) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (219.00,335.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (135,152) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (135,153) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (135.50,172.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (276,319) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (276.00,335.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (164,152) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (164,153) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (164.00,172.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (333,319) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (333.00,335.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (192,152) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (192,153) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (192.50,172.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (390,319) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (390.00,335.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (221,152) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (221,153) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (221.00,172.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (447,319) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (447.00,335.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (249,152) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (249,153) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (249.50,172.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (504,319) size 26x21 contains 1 chunk(s)
@@ -369,49 +369,49 @@ layer at (0,0) size 800x600
       RenderSVGText {text} at (0,443) size 43x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 43x21
           chunk 1 text run 1 at (0.00,459.00) startOffset 0 endOffset 6 width 43.00: "stroke"
-      RenderSVGText {text} at (50,209) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (50,210) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (50.00,229.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (105,433) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (105.00,449.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (78,209) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (78,210) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (78.50,229.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (162,433) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (162.00,449.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (107,209) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (107,210) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (107.00,229.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (219,433) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (219.00,449.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (135,209) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (135,210) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (135.50,229.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (276,433) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (276.00,449.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (164,209) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (164,210) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (164.00,229.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (333,433) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (333.00,449.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (192,209) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (192,210) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (192.50,229.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (390,433) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (390.00,449.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (221,209) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (221,210) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (221.00,229.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (447,433) size 26x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 26x21
           chunk 1 text run 1 at (447.00,449.00) startOffset 0 endOffset 3 width 26.00: "HIT"
-      RenderSVGText {text} at (249,209) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (249,210) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (249.50,229.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (504,433) size 26x21 contains 1 chunk(s)
@@ -471,49 +471,49 @@ layer at (0,0) size 800x600
       RenderSVGText {text} at (0,557) size 36x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 36x21
           chunk 1 text run 1 at (0.00,573.00) startOffset 0 endOffset 4 width 36.00: "none"
-      RenderSVGText {text} at (50,266) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (50,267) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (50.00,286.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (105,547) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (105.00,563.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (78,266) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (78,267) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (78.50,286.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (162,547) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (162.00,563.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (107,266) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (107,267) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (107.00,286.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (219,547) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (219.00,563.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (135,266) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (135,267) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (135.50,286.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (276,547) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (276.00,563.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (164,266) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (164,267) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (164.00,286.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (333,547) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (333.00,563.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (192,266) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (192,267) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (192.50,286.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (390,547) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (390.00,563.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (221,266) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (221,267) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (221.00,286.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (447,547) size 33x21 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 33x21
           chunk 1 text run 1 at (447.00,563.00) startOffset 0 endOffset 4 width 33.00: "miss"
-      RenderSVGText {text} at (249,266) size 11x26 contains 1 chunk(s)
+      RenderSVGText {text} at (249,267) size 11x26 contains 1 chunk(s)
         RenderSVGInlineText {#text} at (0,0) size 11x26
           chunk 1 text run 1 at (249.50,286.50) startOffset 0 endOffset 1 width 11.00: "#"
       RenderSVGText {text} at (504,547) size 33x21 contains 1 chunk(s)

diff --git a/LayoutTests/platform/qt/svg/custom/text-ctm-expected.png b/LayoutTests/platform/qt/svg/custom/text-ctm-expected.png
index e6bf164..0ce6a8a 100644 (file)
Binary files a/LayoutTests/platform/qt/svg/custom/text-ctm-expected.png and b/LayoutTests/platform/qt/svg/custom/text-ctm-expected.png differ

diff --git a/LayoutTests/platform/qt/svg/custom/text-ctm-expected.txt b/LayoutTests/platform/qt/svg/custom/text-ctm-expected.txt
index 0dd4ca6..47fd776 100644 (file)
--- a/LayoutTests/platform/qt/svg/custom/text-ctm-expected.txt
+++ b/LayoutTests/platform/qt/svg/custom/text-ctm-expected.txt
@@ -6,4 +6,4 @@ layer at (0,0) size 800x600
       RenderSVGViewportContainer {svg} at (100,68) size 108x42
         RenderSVGText {text} at (70,54) size 54x21 contains 1 chunk(s)
           RenderSVGInlineText {#text} at (0,0) size 54x21
-            chunk 1 text run 1 at (70.00,70.00) startOffset 0 endOffset 6 width 54.00: "Passed"
+            chunk 1 text run 1 at (70.00,70.00) startOffset 0 endOffset 6 width 53.50: "Passed"

diff --git a/LayoutTests/platform/qt/svg/hixie/perf/003-expected.png b/LayoutTests/platform/qt/svg/hixie/perf/003-expected.png
index eb91aae..15442d1 100644 (file)
Binary files a/LayoutTests/platform/qt/svg/hixie/perf/003-expected.png and b/LayoutTests/platform/qt/svg/hixie/perf/003-expected.png differ

diff --git a/LayoutTests/platform/qt/svg/hixie/perf/003-expected.txt b/LayoutTests/platform/qt/svg/hixie/perf/003-expected.txt
index 1933359..e9c2504 100644 (file)
--- a/LayoutTests/platform/qt/svg/hixie/perf/003-expected.txt
+++ b/LayoutTests/platform/qt/svg/hixie/perf/003-expected.txt
@@ -11,100 +11,100 @@ layer at (0,0) size 400x400
     RenderSVGRect {rect} at (0,0) size 400x400 [stroke={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=100.00] [height=100.00]
     RenderSVGText {text} at (9,37) size 3x7 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 3x7
-        chunk 1 text run 1 at (9.00,42.00) startOffset 0 endOffset 1 width 3.00: "0"
+        chunk 1 text run 1 at (9.00,42.00) startOffset 0 endOffset 1 width 2.75: "0"
     RenderSVGText {text} at (65,77) size 2x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x4
-        chunk 1 text run 1 at (65.00,80.00) startOffset 0 endOffset 1 width 2.00: "1"
+        chunk 1 text run 1 at (65.00,80.00) startOffset 0 endOffset 1 width 1.75: "1"
     RenderSVGText {text} at (92,92) size 1x2 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 1x2
-        chunk 1 text run 1 at (92.00,93.00) startOffset 0 endOffset 1 width 1.00: "2"
+        chunk 1 text run 1 at (92.00,93.00) startOffset 0 endOffset 1 width 0.50: "2"
     RenderSVGText {text} at (30,27) size 2x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x4
-        chunk 1 text run 1 at (30.00,30.00) startOffset 0 endOffset 1 width 2.00: "3"
+        chunk 1 text run 1 at (30.00,30.00) startOffset 0 endOffset 1 width 1.75: "3"
     RenderSVGText {text} at (92,53) size 1x2 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 1x2
-        chunk 1 text run 1 at (92.00,54.00) startOffset 0 endOffset 1 width 1.00: "4"
-    RenderSVGText {text} at (40,25) size 4x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x11
-        chunk 1 text run 1 at (40.00,33.00) startOffset 0 endOffset 1 width 4.00: "5"
-    RenderSVGText {text} at (65,68) size 4x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x11
-        chunk 1 text run 1 at (65.00,76.00) startOffset 0 endOffset 1 width 4.00: "6"
+        chunk 1 text run 1 at (92.00,54.00) startOffset 0 endOffset 1 width 0.50: "4"
+    RenderSVGText {text} at (40,25) size 5x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x11
+        chunk 1 text run 1 at (40.00,33.00) startOffset 0 endOffset 1 width 4.50: "5"
+    RenderSVGText {text} at (65,68) size 5x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x11
+        chunk 1 text run 1 at (65.00,76.00) startOffset 0 endOffset 1 width 4.50: "6"
     RenderSVGText {text} at (47,49) size 4x9 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 4x9
         chunk 1 text run 1 at (47.00,56.00) startOffset 0 endOffset 1 width 4.00: "7"
-    RenderSVGText {text} at (79,-6) size 4x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x11
-        chunk 1 text run 1 at (79.00,2.00) startOffset 0 endOffset 1 width 4.00: "8"
+    RenderSVGText {text} at (79,-6) size 5x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x11
+        chunk 1 text run 1 at (79.00,2.00) startOffset 0 endOffset 1 width 4.50: "8"
     RenderSVGText {text} at (10,74) size 3x7 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 3x7
-        chunk 1 text run 1 at (10.00,79.00) startOffset 0 endOffset 1 width 3.00: "9"
-    RenderSVGText {text} at (77,36) size 2x2 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 2x2
-        chunk 1 text run 1 at (77.00,37.00) startOffset 0 endOffset 2 width 2.00: "10"
-    RenderSVGText {text} at (45,76) size 4x6 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x6
-        chunk 1 text run 1 at (45.00,80.00) startOffset 0 endOffset 2 width 4.00: "11"
-    RenderSVGText {text} at (27,76) size 4x6 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x6
-        chunk 1 text run 1 at (27.00,80.00) startOffset 0 endOffset 2 width 4.00: "12"
+        chunk 1 text run 1 at (10.00,79.00) startOffset 0 endOffset 1 width 2.75: "9"
+    RenderSVGText {text} at (77,36) size 1x2 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 1x2
+        chunk 1 text run 1 at (77.00,37.00) startOffset 0 endOffset 2 width 1.00: "10"
+    RenderSVGText {text} at (45,76) size 5x6 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x6
+        chunk 1 text run 1 at (45.00,80.00) startOffset 0 endOffset 2 width 4.50: "11"
+    RenderSVGText {text} at (27,76) size 5x6 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x6
+        chunk 1 text run 1 at (27.00,80.00) startOffset 0 endOffset 2 width 4.50: "12"
     RenderSVGText {text} at (13,17) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (13.00,19.00) startOffset 0 endOffset 2 width 2.00: "13"
-    RenderSVGText {text} at (43,98) size 2x2 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 2x2
-        chunk 1 text run 1 at (43.00,99.00) startOffset 0 endOffset 2 width 2.00: "14"
+    RenderSVGText {text} at (43,98) size 1x2 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 1x2
+        chunk 1 text run 1 at (43.00,99.00) startOffset 0 endOffset 2 width 1.00: "14"
     RenderSVGText {text} at (52,29) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (52.00,31.00) startOffset 0 endOffset 2 width 2.00: "15"
     RenderSVGText {text} at (55,87) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (55.00,89.00) startOffset 0 endOffset 2 width 2.00: "16"
-    RenderSVGText {text} at (46,16) size 6x8 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 6x8
-        chunk 1 text run 1 at (46.00,22.00) startOffset 0 endOffset 2 width 6.00: "17"
-    RenderSVGText {text} at (1,19) size 4x6 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x6
-        chunk 1 text run 1 at (1.00,23.00) startOffset 0 endOffset 2 width 4.00: "18"
+    RenderSVGText {text} at (46,16) size 7x8 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 7x8
+        chunk 1 text run 1 at (46.00,22.00) startOffset 0 endOffset 2 width 6.50: "17"
+    RenderSVGText {text} at (1,19) size 5x6 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x6
+        chunk 1 text run 1 at (1.00,23.00) startOffset 0 endOffset 2 width 4.50: "18"
     RenderSVGText {text} at (24,39) size 4x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 4x4
-        chunk 1 text run 1 at (24.00,42.00) startOffset 0 endOffset 2 width 4.00: "19"
-    RenderSVGText {text} at (42,26) size 2x2 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 2x2
-        chunk 1 text run 1 at (42.00,27.00) startOffset 0 endOffset 2 width 2.00: "20"
+        chunk 1 text run 1 at (24.00,42.00) startOffset 0 endOffset 2 width 3.50: "19"
+    RenderSVGText {text} at (42,26) size 1x2 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 1x2
+        chunk 1 text run 1 at (42.00,27.00) startOffset 0 endOffset 2 width 1.00: "20"
     RenderSVGText {text} at (11,76) size 6x7 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 6x7
-        chunk 1 text run 1 at (11.00,81.00) startOffset 0 endOffset 2 width 6.00: "21"
-    RenderSVGText {text} at (15,25) size 2x2 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 2x2
-        chunk 1 text run 1 at (15.00,26.00) startOffset 0 endOffset 2 width 2.00: "22"
+        chunk 1 text run 1 at (11.00,81.00) startOffset 0 endOffset 2 width 5.50: "21"
+    RenderSVGText {text} at (15,25) size 1x2 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 1x2
+        chunk 1 text run 1 at (15.00,26.00) startOffset 0 endOffset 2 width 1.00: "22"
     RenderSVGText {text} at (18,17) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (18.00,19.00) startOffset 0 endOffset 2 width 2.00: "23"
-    RenderSVGText {text} at (42,74) size 6x8 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 6x8
-        chunk 1 text run 1 at (42.00,80.00) startOffset 0 endOffset 2 width 6.00: "24"
-    RenderSVGText {text} at (49,5) size 2x2 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 2x2
-        chunk 1 text run 1 at (49.00,6.00) startOffset 0 endOffset 2 width 2.00: "25"
+    RenderSVGText {text} at (42,74) size 7x8 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 7x8
+        chunk 1 text run 1 at (42.00,80.00) startOffset 0 endOffset 2 width 6.50: "24"
+    RenderSVGText {text} at (49,5) size 1x2 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 1x2
+        chunk 1 text run 1 at (49.00,6.00) startOffset 0 endOffset 2 width 1.00: "25"
     RenderSVGText {text} at (50,57) size 6x7 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 6x7
-        chunk 1 text run 1 at (50.00,62.00) startOffset 0 endOffset 2 width 6.00: "26"
+        chunk 1 text run 1 at (50.00,62.00) startOffset 0 endOffset 2 width 5.50: "26"
     RenderSVGText {text} at (30,60) size 8x9 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 8x9
         chunk 1 text run 1 at (30.00,67.00) startOffset 0 endOffset 2 width 8.00: "27"
     RenderSVGText {text} at (69,70) size 4x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 4x4
-        chunk 1 text run 1 at (69.00,73.00) startOffset 0 endOffset 2 width 4.00: "28"
-    RenderSVGText {text} at (95,12) size 6x8 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 6x8
-        chunk 1 text run 1 at (95.00,18.00) startOffset 0 endOffset 2 width 6.00: "29"
-    RenderSVGText {text} at (36,63) size 6x8 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 6x8
-        chunk 1 text run 1 at (36.00,69.00) startOffset 0 endOffset 2 width 6.00: "30"
-    RenderSVGText {text} at (49,6) size 4x6 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x6
-        chunk 1 text run 1 at (49.00,10.00) startOffset 0 endOffset 2 width 4.00: "31"
+        chunk 1 text run 1 at (69.00,73.00) startOffset 0 endOffset 2 width 3.50: "28"
+    RenderSVGText {text} at (95,12) size 7x8 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 7x8
+        chunk 1 text run 1 at (95.00,18.00) startOffset 0 endOffset 2 width 6.50: "29"
+    RenderSVGText {text} at (36,63) size 7x8 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 7x8
+        chunk 1 text run 1 at (36.00,69.00) startOffset 0 endOffset 2 width 6.50: "30"
+    RenderSVGText {text} at (49,6) size 5x6 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x6
+        chunk 1 text run 1 at (49.00,10.00) startOffset 0 endOffset 2 width 4.50: "31"
     RenderSVGText {text} at (46,35) size 8x9 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 8x9
         chunk 1 text run 1 at (46.00,42.00) startOffset 0 endOffset 2 width 8.00: "32"
@@ -113,64 +113,64 @@ layer at (0,0) size 400x400
         chunk 1 text run 1 at (85.00,88.00) startOffset 0 endOffset 2 width 2.00: "33"
     RenderSVGText {text} at (54,95) size 6x7 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 6x7
-        chunk 1 text run 1 at (54.00,100.00) startOffset 0 endOffset 2 width 6.00: "34"
+        chunk 1 text run 1 at (54.00,100.00) startOffset 0 endOffset 2 width 5.50: "34"
     RenderSVGText {text} at (26,96) size 4x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 4x4
-        chunk 1 text run 1 at (26.00,99.00) startOffset 0 endOffset 2 width 4.00: "35"
+        chunk 1 text run 1 at (26.00,99.00) startOffset 0 endOffset 2 width 3.50: "35"
     RenderSVGText {text} at (15,42) size 6x7 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 6x7
-        chunk 1 text run 1 at (15.00,47.00) startOffset 0 endOffset 2 width 6.00: "36"
+        chunk 1 text run 1 at (15.00,47.00) startOffset 0 endOffset 2 width 5.50: "36"
     RenderSVGText {text} at (56,85) size 4x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 4x4
-        chunk 1 text run 1 at (56.00,88.00) startOffset 0 endOffset 2 width 4.00: "37"
+        chunk 1 text run 1 at (56.00,88.00) startOffset 0 endOffset 2 width 3.50: "37"
     RenderSVGText {text} at (18,21) size 6x7 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 6x7
-        chunk 1 text run 1 at (18.00,26.00) startOffset 0 endOffset 2 width 6.00: "38"
+        chunk 1 text run 1 at (18.00,26.00) startOffset 0 endOffset 2 width 5.50: "38"
     RenderSVGText {text} at (92,44) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (92.00,46.00) startOffset 0 endOffset 2 width 2.00: "39"
-    RenderSVGText {text} at (40,41) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (40.00,49.00) startOffset 0 endOffset 2 width 8.00: "40"
-    RenderSVGText {text} at (41,59) size 2x2 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 2x2
-        chunk 1 text run 1 at (41.00,60.00) startOffset 0 endOffset 2 width 2.00: "41"
+    RenderSVGText {text} at (40,41) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (40.00,49.00) startOffset 0 endOffset 2 width 9.00: "40"
+    RenderSVGText {text} at (41,59) size 1x2 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 1x2
+        chunk 1 text run 1 at (41.00,60.00) startOffset 0 endOffset 2 width 1.00: "41"
     RenderSVGText {text} at (66,5) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (66.00,7.00) startOffset 0 endOffset 2 width 2.00: "42"
-    RenderSVGText {text} at (85,9) size 2x2 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 2x2
-        chunk 1 text run 1 at (85.00,10.00) startOffset 0 endOffset 2 width 2.00: "43"
-    RenderSVGText {text} at (7,42) size 6x8 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 6x8
-        chunk 1 text run 1 at (7.00,48.00) startOffset 0 endOffset 2 width 6.00: "44"
-    RenderSVGText {text} at (47,25) size 4x6 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x6
-        chunk 1 text run 1 at (47.00,29.00) startOffset 0 endOffset 2 width 4.00: "45"
+    RenderSVGText {text} at (85,9) size 1x2 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 1x2
+        chunk 1 text run 1 at (85.00,10.00) startOffset 0 endOffset 2 width 1.00: "43"
+    RenderSVGText {text} at (7,42) size 7x8 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 7x8
+        chunk 1 text run 1 at (7.00,48.00) startOffset 0 endOffset 2 width 6.50: "44"
+    RenderSVGText {text} at (47,25) size 5x6 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x6
+        chunk 1 text run 1 at (47.00,29.00) startOffset 0 endOffset 2 width 4.50: "45"
     RenderSVGText {text} at (66,22) size 4x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 4x4
-        chunk 1 text run 1 at (66.00,25.00) startOffset 0 endOffset 2 width 4.00: "46"
+        chunk 1 text run 1 at (66.00,25.00) startOffset 0 endOffset 2 width 3.50: "46"
     RenderSVGText {text} at (13,24) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (13.00,26.00) startOffset 0 endOffset 2 width 2.00: "47"
-    RenderSVGText {text} at (72,29) size 4x6 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x6
-        chunk 1 text run 1 at (72.00,33.00) startOffset 0 endOffset 2 width 4.00: "48"
-    RenderSVGText {text} at (29,65) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (29.00,73.00) startOffset 0 endOffset 2 width 8.00: "49"
+    RenderSVGText {text} at (72,29) size 5x6 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x6
+        chunk 1 text run 1 at (72.00,33.00) startOffset 0 endOffset 2 width 4.50: "48"
+    RenderSVGText {text} at (29,65) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (29.00,73.00) startOffset 0 endOffset 2 width 9.00: "49"
     RenderSVGText {text} at (48,81) size 4x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 4x4
-        chunk 1 text run 1 at (48.00,84.00) startOffset 0 endOffset 2 width 4.00: "50"
+        chunk 1 text run 1 at (48.00,84.00) startOffset 0 endOffset 2 width 3.50: "50"
     RenderSVGText {text} at (57,19) size 6x7 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 6x7
-        chunk 1 text run 1 at (57.00,24.00) startOffset 0 endOffset 2 width 6.00: "51"
-    RenderSVGText {text} at (61,34) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (61.00,42.00) startOffset 0 endOffset 2 width 8.00: "52"
-    RenderSVGText {text} at (46,66) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (46.00,74.00) startOffset 0 endOffset 2 width 8.00: "53"
+        chunk 1 text run 1 at (57.00,24.00) startOffset 0 endOffset 2 width 5.50: "51"
+    RenderSVGText {text} at (61,34) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (61.00,42.00) startOffset 0 endOffset 2 width 9.00: "52"
+    RenderSVGText {text} at (46,66) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (46.00,74.00) startOffset 0 endOffset 2 width 9.00: "53"
     RenderSVGText {text} at (70,3) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (70.00,5.00) startOffset 0 endOffset 2 width 2.00: "54"
@@ -180,132 +180,132 @@ layer at (0,0) size 400x400
     RenderSVGText {text} at (62,67) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (62.00,69.00) startOffset 0 endOffset 2 width 2.00: "56"
-    RenderSVGText {text} at (34,73) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (34.00,81.00) startOffset 0 endOffset 2 width 8.00: "57"
+    RenderSVGText {text} at (34,73) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (34.00,81.00) startOffset 0 endOffset 2 width 9.00: "57"
     RenderSVGText {text} at (74,14) size 6x7 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 6x7
-        chunk 1 text run 1 at (74.00,19.50) startOffset 0 endOffset 2 width 6.00: "58"
-    RenderSVGText {text} at (13,61) size 6x8 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 6x8
-        chunk 1 text run 1 at (13.00,67.00) startOffset 0 endOffset 2 width 6.00: "59"
-    RenderSVGText {text} at (32,6) size 4x6 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x6
-        chunk 1 text run 1 at (32.00,10.00) startOffset 0 endOffset 2 width 4.00: "60"
-    RenderSVGText {text} at (20,45) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (20.00,53.00) startOffset 0 endOffset 2 width 8.00: "61"
+        chunk 1 text run 1 at (74.00,19.50) startOffset 0 endOffset 2 width 5.50: "58"
+    RenderSVGText {text} at (13,61) size 7x8 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 7x8
+        chunk 1 text run 1 at (13.00,67.00) startOffset 0 endOffset 2 width 6.50: "59"
+    RenderSVGText {text} at (32,6) size 5x6 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x6
+        chunk 1 text run 1 at (32.00,10.00) startOffset 0 endOffset 2 width 4.50: "60"
+    RenderSVGText {text} at (20,45) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (20.00,53.00) startOffset 0 endOffset 2 width 9.00: "61"
     RenderSVGText {text} at (8,74) size 6x7 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 6x7
-        chunk 1 text run 1 at (8.00,79.00) startOffset 0 endOffset 2 width 6.00: "62"
+        chunk 1 text run 1 at (8.00,79.00) startOffset 0 endOffset 2 width 5.50: "62"
     RenderSVGText {text} at (2,53) size 4x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 4x4
-        chunk 1 text run 1 at (2.00,56.00) startOffset 0 endOffset 2 width 4.00: "63"
-    RenderSVGText {text} at (60,26) size 6x8 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 6x8
-        chunk 1 text run 1 at (60.00,32.00) startOffset 0 endOffset 2 width 6.00: "64"
+        chunk 1 text run 1 at (2.00,56.00) startOffset 0 endOffset 2 width 3.50: "63"
+    RenderSVGText {text} at (60,26) size 7x8 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 7x8
+        chunk 1 text run 1 at (60.00,32.00) startOffset 0 endOffset 2 width 6.50: "64"
     RenderSVGText {text} at (97,96) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (97.00,98.00) startOffset 0 endOffset 2 width 2.00: "65"
     RenderSVGText {text} at (58,75) size 4x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 4x4
-        chunk 1 text run 1 at (58.00,78.00) startOffset 0 endOffset 2 width 4.00: "66"
+        chunk 1 text run 1 at (58.00,78.00) startOffset 0 endOffset 2 width 3.50: "66"
     RenderSVGText {text} at (1,5) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (1.00,7.00) startOffset 0 endOffset 2 width 2.00: "67"
     RenderSVGText {text} at (0,0) size 4x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 4x4
-        chunk 1 text run 1 at (0.00,3.00) startOffset 0 endOffset 2 width 4.00: "68"
-    RenderSVGText {text} at (89,62) size 6x8 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 6x8
-        chunk 1 text run 1 at (89.00,68.00) startOffset 0 endOffset 2 width 6.00: "69"
+        chunk 1 text run 1 at (0.00,3.00) startOffset 0 endOffset 2 width 3.50: "68"
+    RenderSVGText {text} at (89,62) size 7x8 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 7x8
+        chunk 1 text run 1 at (89.00,68.00) startOffset 0 endOffset 2 width 6.50: "69"
     RenderSVGText {text} at (85,9) size 4x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 4x4
-        chunk 1 text run 1 at (85.00,12.00) startOffset 0 endOffset 2 width 4.00: "70"
+        chunk 1 text run 1 at (85.00,12.00) startOffset 0 endOffset 2 width 3.50: "70"
     RenderSVGText {text} at (48,75) size 6x7 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 6x7
-        chunk 1 text run 1 at (48.00,80.00) startOffset 0 endOffset 2 width 6.00: "71"
-    RenderSVGText {text} at (52,34) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (52.00,42.00) startOffset 0 endOffset 2 width 8.00: "72"
+        chunk 1 text run 1 at (48.00,80.00) startOffset 0 endOffset 2 width 5.50: "71"
+    RenderSVGText {text} at (52,34) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (52.00,42.00) startOffset 0 endOffset 2 width 9.00: "72"
     RenderSVGText {text} at (98,17) size 8x9 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 8x9
         chunk 1 text run 1 at (98.00,24.00) startOffset 0 endOffset 2 width 8.00: "73"
     RenderSVGText {text} at (12,80) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (12.00,82.00) startOffset 0 endOffset 2 width 2.00: "74"
-    RenderSVGText {text} at (26,65) size 4x6 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x6
-        chunk 1 text run 1 at (26.00,69.00) startOffset 0 endOffset 2 width 4.00: "75"
-    RenderSVGText {text} at (5,1) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (5.00,9.00) startOffset 0 endOffset 2 width 8.00: "76"
-    RenderSVGText {text} at (5,35) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (5.00,43.00) startOffset 0 endOffset 2 width 8.00: "77"
-    RenderSVGText {text} at (48,41) size 6x8 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 6x8
-        chunk 1 text run 1 at (48.00,47.00) startOffset 0 endOffset 2 width 6.00: "78"
-    RenderSVGText {text} at (19,15) size 4x6 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x6
-        chunk 1 text run 1 at (19.00,19.00) startOffset 0 endOffset 2 width 4.00: "79"
-    RenderSVGText {text} at (22,63) size 6x8 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 6x8
-        chunk 1 text run 1 at (22.00,69.00) startOffset 0 endOffset 2 width 6.00: "80"
-    RenderSVGText {text} at (34,44) size 2x2 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 2x2
-        chunk 1 text run 1 at (34.00,45.00) startOffset 0 endOffset 2 width 2.00: "81"
-    RenderSVGText {text} at (83,33) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (83.00,41.00) startOffset 0 endOffset 2 width 8.00: "82"
-    RenderSVGText {text} at (13,58) size 6x8 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 6x8
-        chunk 1 text run 1 at (13.00,64.00) startOffset 0 endOffset 2 width 6.00: "83"
+    RenderSVGText {text} at (26,65) size 5x6 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x6
+        chunk 1 text run 1 at (26.00,69.00) startOffset 0 endOffset 2 width 4.50: "75"
+    RenderSVGText {text} at (5,1) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (5.00,9.00) startOffset 0 endOffset 2 width 9.00: "76"
+    RenderSVGText {text} at (5,35) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (5.00,43.00) startOffset 0 endOffset 2 width 9.00: "77"
+    RenderSVGText {text} at (48,41) size 7x8 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 7x8
+        chunk 1 text run 1 at (48.00,47.00) startOffset 0 endOffset 2 width 6.50: "78"
+    RenderSVGText {text} at (19,15) size 5x6 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x6
+        chunk 1 text run 1 at (19.00,19.00) startOffset 0 endOffset 2 width 4.50: "79"
+    RenderSVGText {text} at (22,63) size 7x8 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 7x8
+        chunk 1 text run 1 at (22.00,69.00) startOffset 0 endOffset 2 width 6.50: "80"
+    RenderSVGText {text} at (34,44) size 1x2 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 1x2
+        chunk 1 text run 1 at (34.00,45.00) startOffset 0 endOffset 2 width 1.00: "81"
+    RenderSVGText {text} at (83,33) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (83.00,41.00) startOffset 0 endOffset 2 width 9.00: "82"
+    RenderSVGText {text} at (13,58) size 7x8 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 7x8
+        chunk 1 text run 1 at (13.00,64.00) startOffset 0 endOffset 2 width 6.50: "83"
     RenderSVGText {text} at (65,-6) size 8x9 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 8x9
         chunk 1 text run 1 at (65.00,1.00) startOffset 0 endOffset 2 width 8.00: "84"
-    RenderSVGText {text} at (77,35) size 4x6 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x6
-        chunk 1 text run 1 at (77.00,39.00) startOffset 0 endOffset 2 width 4.00: "85"
+    RenderSVGText {text} at (77,35) size 5x6 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x6
+        chunk 1 text run 1 at (77.00,39.00) startOffset 0 endOffset 2 width 4.50: "85"
     RenderSVGText {text} at (23,18) size 8x9 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 8x9
         chunk 1 text run 1 at (23.00,25.00) startOffset 0 endOffset 2 width 8.00: "86"
-    RenderSVGText {text} at (40,76) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (40.00,84.00) startOffset 0 endOffset 2 width 8.00: "87"
+    RenderSVGText {text} at (40,76) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (40.00,84.00) startOffset 0 endOffset 2 width 9.00: "87"
     RenderSVGText {text} at (56,32) size 4x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 4x4
-        chunk 1 text run 1 at (56.00,35.00) startOffset 0 endOffset 2 width 4.00: "88"
+        chunk 1 text run 1 at (56.00,35.00) startOffset 0 endOffset 2 width 3.50: "88"
     RenderSVGText {text} at (65,70) size 8x9 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 8x9
         chunk 1 text run 1 at (65.00,77.00) startOffset 0 endOffset 2 width 8.00: "89"
     RenderSVGText {text} at (13,19) size 8x9 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 8x9
         chunk 1 text run 1 at (13.00,26.00) startOffset 0 endOffset 2 width 8.00: "90"
-    RenderSVGText {text} at (54,35) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (54.00,43.00) startOffset 0 endOffset 2 width 8.00: "91"
-    RenderSVGText {text} at (81,28) size 4x6 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 4x6
-        chunk 1 text run 1 at (81.00,32.00) startOffset 0 endOffset 2 width 4.00: "92"
+    RenderSVGText {text} at (54,35) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (54.00,43.00) startOffset 0 endOffset 2 width 9.00: "91"
+    RenderSVGText {text} at (81,28) size 5x6 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 5x6
+        chunk 1 text run 1 at (81.00,32.00) startOffset 0 endOffset 2 width 4.50: "92"
     RenderSVGText {text} at (10,73) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (10.00,75.00) startOffset 0 endOffset 2 width 2.00: "93"
     RenderSVGText {text} at (53,87) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (53.00,89.00) startOffset 0 endOffset 2 width 2.00: "94"
-    RenderSVGText {text} at (25,58) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (25.00,66.00) startOffset 0 endOffset 2 width 8.00: "95"
+    RenderSVGText {text} at (25,58) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (25.00,66.00) startOffset 0 endOffset 2 width 9.00: "95"
     RenderSVGText {text} at (93,46) size 2x3 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 2x3
         chunk 1 text run 1 at (93.00,48.00) startOffset 0 endOffset 2 width 2.00: "96"
-    RenderSVGText {text} at (61,72) size 8x11 contains 1 chunk(s)
-      RenderSVGInlineText {#text} at (0,0) size 8x11
-        chunk 1 text run 1 at (61.00,80.00) startOffset 0 endOffset 2 width 8.00: "97"
+    RenderSVGText {text} at (61,72) size 9x11 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 9x11
+        chunk 1 text run 1 at (61.00,80.00) startOffset 0 endOffset 2 width 9.00: "97"
     RenderSVGText {text} at (14,-6) size 8x9 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 8x9
         chunk 1 text run 1 at (14.00,1.00) startOffset 0 endOffset 2 width 8.00: "98"
     RenderSVGText {text} at (7,67) size 4x4 contains 1 chunk(s)
       RenderSVGInlineText {#text} at (0,0) size 4x4
-        chunk 1 text run 1 at (7.00,70.00) startOffset 0 endOffset 2 width 4.00: "99"
+        chunk 1 text run 1 at (7.00,70.00) startOffset 0 endOffset 2 width 3.50: "99"

diff --git a/LayoutTests/platform/qt/svg/text/ems-display-none-expected.png b/LayoutTests/platform/qt/svg/text/ems-display-none-expected.png
new file mode 100644 (file)
index 0000000..742e2a5
Binary files /dev/null and b/LayoutTests/platform/qt/svg/text/ems-display-none-expected.png differ

diff --git a/LayoutTests/platform/qt/svg/text/ems-display-none-expected.txt b/LayoutTests/platform/qt/svg/text/ems-display-none-expected.txt
new file mode 100644 (file)
index 0000000..48310d1
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/text/ems-display-none-expected.txt
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderSVGRoot {svg} at (50,51) size 614x91
+    RenderSVGContainer {g} at (50,51) size 614x91
+      RenderSVGText {text} at (50,51) size 614x91 contains 1 chunk(s)
+        RenderSVGTSpan {tspan} at (0,0) size 603x51
+          RenderSVGInlineText {#text} at (0,0) size 603x51
+            chunk 1 text run 1 at (50.00,90.00) startOffset 0 endOffset 36 width 603.00: "Two lines of text should be visible."
+        RenderSVGInlineText {#text} at (603,0) size 11x51
+          chunk 1 text run 1 at (653.00,90.00) startOffset 0 endOffset 1 width 11.00: " "
+        RenderSVGTSpan {tspan} at (0,0) size 603x51
+          RenderSVGInlineText {#text} at (0,40) size 603x51
+            chunk 1 text run 1 at (50.00,130.00) startOffset 0 endOffset 36 width 603.00: "Two lines of text should be visible."

diff --git a/LayoutTests/platform/qt/svg/text/exs-display-none-expected.png b/LayoutTests/platform/qt/svg/text/exs-display-none-expected.png
new file mode 100644 (file)
index 0000000..5d84efa
Binary files /dev/null and b/LayoutTests/platform/qt/svg/text/exs-display-none-expected.png differ

diff --git a/LayoutTests/platform/qt/svg/text/exs-display-none-expected.txt b/LayoutTests/platform/qt/svg/text/exs-display-none-expected.txt
new file mode 100644 (file)
index 0000000..8a3209c
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/text/exs-display-none-expected.txt
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderSVGRoot {svg} at (50,53) size 614x93
+    RenderSVGContainer {g} at (50,53) size 614x93
+      RenderSVGText {text} at (50,53) size 614x93 contains 1 chunk(s)
+        RenderSVGTSpan {tspan} at (0,0) size 603x51
+          RenderSVGInlineText {#text} at (0,0) size 603x51
+            chunk 1 text run 1 at (50.00,92.00) startOffset 0 endOffset 36 width 603.00: "Two lines of text should be visible."
+        RenderSVGInlineText {#text} at (603,0) size 11x51
+          chunk 1 text run 1 at (653.00,92.00) startOffset 0 endOffset 1 width 11.00: " "
+        RenderSVGTSpan {tspan} at (0,0) size 603x51
+          RenderSVGInlineText {#text} at (0,42) size 603x51
+            chunk 1 text run 1 at (50.00,134.00) startOffset 0 endOffset 36 width 603.00: "Two lines of text should be visible."

diff --git a/LayoutTests/platform/qt/svg/text/text-fill-opacity-expected.png b/LayoutTests/platform/qt/svg/text/text-fill-opacity-expected.png
new file mode 100644 (file)
index 0000000..403357a
Binary files /dev/null and b/LayoutTests/platform/qt/svg/text/text-fill-opacity-expected.png differ

diff --git a/LayoutTests/platform/qt/svg/text/text-fill-opacity-expected.txt b/LayoutTests/platform/qt/svg/text/text-fill-opacity-expected.txt
new file mode 100644 (file)
index 0000000..8477025
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/text/text-fill-opacity-expected.txt
@@ -0,0 +1,11 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 500x100
+  RenderSVGRoot {svg} at (10,0) size 217x100
+    RenderSVGPath {circle} at (15,0) size 170x100 [fill={[type=SOLID] [color=#B4B4FA]}] [cx=100.00] [cy=20.00] [r=85.00]
+    RenderSVGText {text} at (10,6) size 217x51 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 217x51
+        chunk 1 text run 1 at (10.00,45.00) startOffset 0 endOffset 11 width 217.00: "30% opacity"
+    RenderSVGText {text} at (10,56) size 217x51 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 217x51
+        chunk 1 text run 1 at (10.00,95.00) startOffset 0 endOffset 11 width 217.00: "30% opacity"

diff --git a/LayoutTests/platform/qt/svg/text/text-viewbox-rescale-expected.png b/LayoutTests/platform/qt/svg/text/text-viewbox-rescale-expected.png
new file mode 100644 (file)
index 0000000..f77732a
Binary files /dev/null and b/LayoutTests/platform/qt/svg/text/text-viewbox-rescale-expected.png differ

diff --git a/LayoutTests/platform/qt/svg/text/text-viewbox-rescale-expected.txt b/LayoutTests/platform/qt/svg/text/text-viewbox-rescale-expected.txt
new file mode 100644 (file)
index 0000000..7a89980
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/text/text-viewbox-rescale-expected.txt
@@ -0,0 +1,23 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+layer at (0,0) size 200x200
+  RenderSVGRoot {svg} at (0,0) size 200x200
+    RenderSVGViewportContainer {svg} at (0,0) size 200x200
+      RenderSVGText {text} at (0,0) size 1x1 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,0) size 1x1
+          chunk 1 text run 1 at (0.30,0.30) startOffset 0 endOffset 5 width 0.29: "PASS "
+        RenderSVGTSpan {tspan} at (0,0) size 1x1
+          RenderSVGInlineText {#text} at (0,0) size 1x1
+            chunk 1 text run 1 at (0.59,0.30) startOffset 0 endOffset 4 width 0.26: "PASS"
+        RenderSVGInlineText {#text} at (0,0) size 0x0
+    RenderSVGViewportContainer {svg} at (0,100) size 200x100
+      RenderSVGText {text} at (0,0) size 1x1 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,0) size 1x1
+          chunk 1 text run 1 at (0.30,0.30) startOffset 0 endOffset 5 width 0.29: "PASS "
+        RenderSVGTSpan {tspan} at (0,0) size 1x1
+          RenderSVGInlineText {#text} at (0,0) size 1x1
+            chunk 1 text run 1 at (0.59,0.30) startOffset 0 endOffset 4 width 0.26: "PASS"
+        RenderSVGInlineText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/qt/svg/text/tspan-dynamic-positioning-expected.png b/LayoutTests/platform/qt/svg/text/tspan-dynamic-positioning-expected.png
new file mode 100644 (file)
index 0000000..e0dacd9
Binary files /dev/null and b/LayoutTests/platform/qt/svg/text/tspan-dynamic-positioning-expected.png differ

diff --git a/LayoutTests/platform/qt/svg/text/tspan-dynamic-positioning-expected.txt b/LayoutTests/platform/qt/svg/text/tspan-dynamic-positioning-expected.txt
new file mode 100644 (file)
index 0000000..0224091
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/text/tspan-dynamic-positioning-expected.txt
@@ -0,0 +1,8 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 600x500
+  RenderSVGRoot {svg} at (200,184) size 280x21
+    RenderSVGText {text} at (200,184) size 280x21 contains 1 chunk(s)
+      RenderSVGTSpan {tspan} at (0,0) size 280x21
+        RenderSVGInlineText {#text} at (0,0) size 280x21
+          chunk 1 text run 1 at (200.00,200.00) startOffset 0 endOffset 41 width 280.00: "This text should be at visible at 200,200"