[Qt] svg/dom, svg/filters, svg/foreignObject rebaseline after new test fonts.
https://bugs.webkit.org/show_bug.cgi?id=92243
Unreviewed gardening.
These tests have been skipped because monospace fonts weren't properly used by
layout tests. After r121971, the test results are normal again.
* platform/qt-5.0/Skipped:
* platform/qt/svg/dom/SVGPathSegList-cloning-expected.png:
* platform/qt/svg/dom/SVGPathSegList-cloning-expected.txt:
* platform/qt/svg/dom/SVGPathSegList-segment-modification-expected.png:
* platform/qt/svg/dom/SVGPathSegList-segment-modification-expected.txt:
* platform/qt/svg/dom/SVGPathSegList-xml-dom-synchronization2-expected.png:
* platform/qt/svg/dom/SVGPathSegList-xml-dom-synchronization2-expected.txt:
* platform/qt/svg/filters/feColorMatrix-values-expected.txt:
* platform/qt/svg/filters/feComposite-expected.png: Added.
* platform/qt/svg/filters/feComposite-expected.txt:
* platform/qt/svg/filters/filter-on-filter-for-text-expected.png:
* platform/qt/svg/filters/filter-on-filter-for-text-expected.txt:
* platform/qt/svg/filters/filter-on-tspan-expected.png:
* platform/qt/svg/filters/filter-on-tspan-expected.txt:
* platform/qt/svg/filters/filter-width-update-expected.png:
* platform/qt/svg/filters/filter-width-update-expected.txt:
* platform/qt/svg/filters/sourceAlpha-expected.png: Added.
* platform/qt/svg/filters/sourceAlpha-expected.txt:
* platform/qt/svg/foreignObject/fO-parent-display-changes-expected.txt:
* platform/qt/svg/foreignObject/fO-parent-display-none-expected.txt:
* platform/qt/svg/foreignObject/fO-parent-display-none-with-relative-pos-content-expected.txt:
* platform/qt/svg/foreignObject/fO-parent-of-parent-display-none-expected.txt:
* platform/qt/svg/foreignObject/fO-parent-of-parent-display-none-with-relative-pos-content-expected.txt:
* platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.png:
* platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt:
* platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt:
* platform/qt/svg/foreignObject/svg-document-in-html-document-expected.png:
* platform/qt/svg/foreignObject/svg-document-in-html-document-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@123609 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8e9ee33..ab004d4 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,44 @@
2012-07-25 Alexis Menard <alexis.menard@openbossa.org>
+ [Qt] svg/dom, svg/filters, svg/foreignObject rebaseline after new test fonts.
+ https://bugs.webkit.org/show_bug.cgi?id=92243
+
+ Unreviewed gardening.
+
+ These tests have been skipped because monospace fonts weren't properly used by
+ layout tests. After r121971, the test results are normal again.
+
+ * platform/qt-5.0/Skipped:
+ * platform/qt/svg/dom/SVGPathSegList-cloning-expected.png:
+ * platform/qt/svg/dom/SVGPathSegList-cloning-expected.txt:
+ * platform/qt/svg/dom/SVGPathSegList-segment-modification-expected.png:
+ * platform/qt/svg/dom/SVGPathSegList-segment-modification-expected.txt:
+ * platform/qt/svg/dom/SVGPathSegList-xml-dom-synchronization2-expected.png:
+ * platform/qt/svg/dom/SVGPathSegList-xml-dom-synchronization2-expected.txt:
+ * platform/qt/svg/filters/feColorMatrix-values-expected.txt:
+ * platform/qt/svg/filters/feComposite-expected.png: Added.
+ * platform/qt/svg/filters/feComposite-expected.txt:
+ * platform/qt/svg/filters/filter-on-filter-for-text-expected.png:
+ * platform/qt/svg/filters/filter-on-filter-for-text-expected.txt:
+ * platform/qt/svg/filters/filter-on-tspan-expected.png:
+ * platform/qt/svg/filters/filter-on-tspan-expected.txt:
+ * platform/qt/svg/filters/filter-width-update-expected.png:
+ * platform/qt/svg/filters/filter-width-update-expected.txt:
+ * platform/qt/svg/filters/sourceAlpha-expected.png: Added.
+ * platform/qt/svg/filters/sourceAlpha-expected.txt:
+ * platform/qt/svg/foreignObject/fO-parent-display-changes-expected.txt:
+ * platform/qt/svg/foreignObject/fO-parent-display-none-expected.txt:
+ * platform/qt/svg/foreignObject/fO-parent-display-none-with-relative-pos-content-expected.txt:
+ * platform/qt/svg/foreignObject/fO-parent-of-parent-display-none-expected.txt:
+ * platform/qt/svg/foreignObject/fO-parent-of-parent-display-none-with-relative-pos-content-expected.txt:
+ * platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.png:
+ * platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt:
+ * platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt:
+ * platform/qt/svg/foreignObject/svg-document-in-html-document-expected.png:
+ * platform/qt/svg/foreignObject/svg-document-in-html-document-expected.txt:
+
+2012-07-25 Alexis Menard <alexis.menard@openbossa.org>
+
[Qt] svg/hixie rebaseline after new test fonts.
https://bugs.webkit.org/show_bug.cgi?id=92242
diff --git a/LayoutTests/platform/qt-5.0/Skipped b/LayoutTests/platform/qt-5.0/Skipped
index 27570b9..258f72a 100644
--- a/LayoutTests/platform/qt-5.0/Skipped
+++ b/LayoutTests/platform/qt-5.0/Skipped
@@ -754,23 +754,6 @@
svg/custom/use-transform.svg
svg/custom/viewbox-syntax.svg
svg/custom/viewport-em.svg
-svg/dom/SVGPathSegList-cloning.html
-svg/dom/SVGPathSegList-segment-modification.svg
-svg/dom/SVGPathSegList-xml-dom-synchronization2.xhtml
-svg/filters/feColorMatrix-values.svg
-svg/filters/feComposite.svg
-svg/filters/filter-on-filter-for-text.svg
-svg/filters/filter-on-tspan.svg
-svg/filters/filter-width-update.svg
-svg/filters/sourceAlpha.svg
-svg/foreignObject/fO-parent-display-changes.svg
-svg/foreignObject/fO-parent-display-none-with-relative-pos-content.svg
-svg/foreignObject/fO-parent-display-none.svg
-svg/foreignObject/fO-parent-of-parent-display-none-with-relative-pos-content.svg
-svg/foreignObject/fO-parent-of-parent-display-none.svg
-svg/foreignObject/no-crash-with-svg-content-in-html-document.svg
-svg/foreignObject/svg-document-as-direct-child.svg
-svg/foreignObject/svg-document-in-html-document.svg
tables/layering/paint-test-layering-1.html
tables/layering/paint-test-layering-2.html
tables/mozilla/bugs/adforce_imgis_com.html
diff --git a/LayoutTests/platform/qt/svg/dom/SVGPathSegList-cloning-expected.png b/LayoutTests/platform/qt/svg/dom/SVGPathSegList-cloning-expected.png
index 05d1f3b..58329ad 100644
--- a/LayoutTests/platform/qt/svg/dom/SVGPathSegList-cloning-expected.png
+++ b/LayoutTests/platform/qt/svg/dom/SVGPathSegList-cloning-expected.png
Binary files differ
diff --git a/LayoutTests/platform/qt/svg/dom/SVGPathSegList-cloning-expected.txt b/LayoutTests/platform/qt/svg/dom/SVGPathSegList-cloning-expected.txt
index 56132ec..f8754da 100644
--- a/LayoutTests/platform/qt/svg/dom/SVGPathSegList-cloning-expected.txt
+++ b/LayoutTests/platform/qt/svg/dom/SVGPathSegList-cloning-expected.txt
@@ -3,11 +3,11 @@
layer at (0,0) size 800x600
RenderBlock {HTML} at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x42
- RenderText {#text} at (0,0) size 736x42
- text run at (0,0) width 736: "Below is a JavaScript-generated svg drawing. You should see two red blobs: the left, a programmatically"
- text run at (0,21) width 270: "generated path and the right, its clone."
- RenderBlock {DIV} at (0,58) size 784x400
- RenderSVGRoot {svg} at (27,195) size 372x162
- RenderSVGPath {path} at (27,195) size 222x162 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M 10 10 L 25 15 L 110 75 L 120 90 L 42 42 Z"]
- RenderSVGPath {path} at (177,195) size 222x162 [transform={m=((1.00,0.00)(0.00,1.00)) t=(75.00,0.00)}] [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M 10 10 L 25 15 L 110 75 L 120 90 L 42 42 Z"]
+ RenderBlock {P} at (0,0) size 784x38
+ RenderText {#text} at (0,0) size 770x38
+ text run at (0,0) width 770: "Below is a JavaScript-generated svg drawing. You should see two red blobs: the left, a programmatically generated path and the"
+ text run at (0,19) width 87: "right, its clone."
+ RenderBlock {DIV} at (0,54) size 784x400
+ RenderSVGRoot {svg} at (27,191) size 372x162
+ RenderSVGPath {path} at (27,191) size 222x162 [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M 10 10 L 25 15 L 110 75 L 120 90 L 42 42 Z"]
+ RenderSVGPath {path} at (177,191) size 222x162 [transform={m=((1.00,0.00)(0.00,1.00)) t=(75.00,0.00)}] [stroke={[type=SOLID] [color=#000000]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M 10 10 L 25 15 L 110 75 L 120 90 L 42 42 Z"]
diff --git a/LayoutTests/platform/qt/svg/dom/SVGPathSegList-segment-modification-expected.png b/LayoutTests/platform/qt/svg/dom/SVGPathSegList-segment-modification-expected.png
index 6d01816..c88eef0 100644
--- a/LayoutTests/platform/qt/svg/dom/SVGPathSegList-segment-modification-expected.png
+++ b/LayoutTests/platform/qt/svg/dom/SVGPathSegList-segment-modification-expected.png
Binary files differ
diff --git a/LayoutTests/platform/qt/svg/dom/SVGPathSegList-segment-modification-expected.txt b/LayoutTests/platform/qt/svg/dom/SVGPathSegList-segment-modification-expected.txt
index a82a49c..20350c9 100644
--- a/LayoutTests/platform/qt/svg/dom/SVGPathSegList-segment-modification-expected.txt
+++ b/LayoutTests/platform/qt/svg/dom/SVGPathSegList-segment-modification-expected.txt
@@ -1,10 +1,10 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 300x300
- RenderSVGRoot {svg} at (10,4) size 239x126
+ RenderSVGRoot {svg} at (10,5) size 201x125
RenderSVGPath {path} at (49,38) size 113x42 [stroke={[type=SOLID] [color=#000000] [stroke width=3.00]}] [data="M 50 50 C 50 50 120 80 160 40"]
RenderSVGContainer {g} at (49,88) size 113x42 [transform={m=((1.00,0.00)(0.00,1.00)) t=(0.00,50.00)}]
RenderSVGPath {path} at (49,88) size 113x42 [stroke={[type=SOLID] [color=#000000] [stroke width=3.00]}] [data="M 50 50 C 50 50 120 80 160 40"]
- RenderSVGText {text} at (10,4) size 239x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 239x21
- chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 33 width 239.00: "Both shapes should look identical"
+ RenderSVGText {text} at (10,5) size 201x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 201x19
+ chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 33 width 201.00: "Both shapes should look identical"
diff --git a/LayoutTests/platform/qt/svg/dom/SVGPathSegList-xml-dom-synchronization2-expected.png b/LayoutTests/platform/qt/svg/dom/SVGPathSegList-xml-dom-synchronization2-expected.png
index 7bf6da0..a3c14af 100644
--- a/LayoutTests/platform/qt/svg/dom/SVGPathSegList-xml-dom-synchronization2-expected.png
+++ b/LayoutTests/platform/qt/svg/dom/SVGPathSegList-xml-dom-synchronization2-expected.png
Binary files differ
diff --git a/LayoutTests/platform/qt/svg/dom/SVGPathSegList-xml-dom-synchronization2-expected.txt b/LayoutTests/platform/qt/svg/dom/SVGPathSegList-xml-dom-synchronization2-expected.txt
index 8e138fe..0c7b8aa 100644
--- a/LayoutTests/platform/qt/svg/dom/SVGPathSegList-xml-dom-synchronization2-expected.txt
+++ b/LayoutTests/platform/qt/svg/dom/SVGPathSegList-xml-dom-synchronization2-expected.txt
@@ -1,23 +1,23 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 600x500
- RenderSVGRoot {svg} at (10,4) size 552x221
+ RenderSVGRoot {svg} at (10,5) size 479x220
RenderSVGPath {path} at (46,103) size 128x122 [stroke={[type=SOLID] [color=#000000] [stroke width=5.00]}] [fill={[type=SOLID] [color=#FF0000]}] [data="M 50 150 L 95 107 L 145 157 L 169 221 L 100 200 Z"]
- RenderSVGText {text} at (10,4) size 385x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 385x21
- chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 52 width 385.00: "Right after loading, a segment is added to the path."
- RenderSVGText {text} at (10,24) size 552x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 552x21
- chunk 1 text run 1 at (10.00,40.00) startOffset 0 endOffset 72 width 552.00: "The path and its attribute should be updated to include the new segment."
- RenderSVGText {text} at (10,54) size 67x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 67x21
- chunk 1 text run 1 at (10.00,70.00) startOffset 0 endOffset 12 width 67.00: "\"d\" initial:"
- RenderSVGText {text} at (90,54) size 229x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 229x21
- chunk 1 text run 1 at (90.00,70.00) startOffset 0 endOffset 32 width 229.00: "M50,150 l45,-43 l24,64 l-69,-21z"
- RenderSVGText {text} at (10,74) size 60x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 60x21
- chunk 1 text run 1 at (10.00,90.00) startOffset 0 endOffset 10 width 60.00: "\"d\" after:"
- RenderSVGText {text} at (90,74) size 303x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 303x21
- chunk 1 text run 1 at (90.00,90.00) startOffset 0 endOffset 45 width 303.00: "M 50 150 l 45 -43 l 50 50 l 24 64 l -69 -21 Z"
+ RenderSVGText {text} at (10,5) size 339x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 339x19
+ chunk 1 text run 1 at (10.00,20.00) startOffset 0 endOffset 52 width 339.00: "Right after loading, a segment is added to the path."
+ RenderSVGText {text} at (10,25) size 479x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 479x19
+ chunk 1 text run 1 at (10.00,40.00) startOffset 0 endOffset 72 width 479.00: "The path and its attribute should be updated to include the new segment."
+ RenderSVGText {text} at (10,55) size 55x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 55x19
+ chunk 1 text run 1 at (10.00,70.00) startOffset 0 endOffset 12 width 55.00: "\"d\" initial:"
+ RenderSVGText {text} at (90,55) size 211x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 211x19
+ chunk 1 text run 1 at (90.00,70.00) startOffset 0 endOffset 32 width 211.00: "M50,150 l45,-43 l24,64 l-69,-21z"
+ RenderSVGText {text} at (10,75) size 52x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 52x19
+ chunk 1 text run 1 at (10.00,90.00) startOffset 0 endOffset 10 width 52.00: "\"d\" after:"
+ RenderSVGText {text} at (90,75) size 281x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 281x19
+ chunk 1 text run 1 at (90.00,90.00) startOffset 0 endOffset 45 width 281.00: "M 50 150 l 45 -43 l 50 50 l 24 64 l -69 -21 Z"
diff --git a/LayoutTests/platform/qt/svg/filters/feColorMatrix-values-expected.txt b/LayoutTests/platform/qt/svg/filters/feColorMatrix-values-expected.txt
index b8011a2..5841df5 100644
--- a/LayoutTests/platform/qt/svg/filters/feColorMatrix-values-expected.txt
+++ b/LayoutTests/platform/qt/svg/filters/feColorMatrix-values-expected.txt
@@ -26,83 +26,83 @@
RenderSVGRect {rect} at (0,0) size 441x441 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=400.00] [height=400.00]
[filter="satfull"] RenderSVGResourceFilter {filter} at (-40,-40) size 480x480
RenderSVGRect {rect} at (2,2) size 196x396 [fill={[type=SOLID] [color=#FF0000]}] [x=2.00] [y=2.00] [width=196.00] [height=396.00]
- RenderSVGText {text} at (10,17) size 184x30 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 184x30
- chunk 1 text run 1 at (10.00,40.00) startOffset 0 endOffset 17 width 184.00: "Should be default"
- RenderSVGText {text} at (10,47) size 72x30 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 72x30
- chunk 1 text run 1 at (10.00,70.00) startOffset 0 endOffset 7 width 72.00: "matrix."
+ RenderSVGText {text} at (10,18) size 168x28 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 168x28
+ chunk 1 text run 1 at (10.00,40.00) startOffset 0 endOffset 17 width 168.00: "Should be default"
+ RenderSVGText {text} at (10,48) size 68x28 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 68x28
+ chunk 1 text run 1 at (10.00,70.00) startOffset 0 endOffset 7 width 68.00: "matrix."
RenderSVGRect {rect} at (0,0) size 221x115 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=0.00] [width=200.00] [height=104.00]
[filter="matnull"] RenderSVGResourceFilter {filter} at (-20,-10.40) size 240x124.80
- RenderSVGText {text} at (10,117) size 184x30 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 184x30
- chunk 1 text run 1 at (10.00,140.00) startOffset 0 endOffset 17 width 184.00: "Should be default"
- RenderSVGText {text} at (10,147) size 93x30 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 93x30
- chunk 1 text run 1 at (10.00,170.00) startOffset 0 endOffset 9 width 93.00: "saturate."
+ RenderSVGText {text} at (10,118) size 168x28 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 168x28
+ chunk 1 text run 1 at (10.00,140.00) startOffset 0 endOffset 17 width 168.00: "Should be default"
+ RenderSVGText {text} at (10,148) size 82x28 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 82x28
+ chunk 1 text run 1 at (10.00,170.00) startOffset 0 endOffset 9 width 82.00: "saturate."
RenderSVGRect {rect} at (0,89) size 221x126 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=100.00] [width=200.00] [height=104.00]
[filter="satnull"] RenderSVGResourceFilter {filter} at (-20,89.60) size 240x124.80
- RenderSVGText {text} at (10,217) size 184x30 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 184x30
- chunk 1 text run 1 at (10.00,240.00) startOffset 0 endOffset 17 width 184.00: "Should be default"
- RenderSVGText {text} at (10,247) size 116x30 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 116x30
- chunk 1 text run 1 at (10.00,270.00) startOffset 0 endOffset 10 width 116.00: "hueRotate."
+ RenderSVGText {text} at (10,218) size 168x28 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 168x28
+ chunk 1 text run 1 at (10.00,240.00) startOffset 0 endOffset 17 width 168.00: "Should be default"
+ RenderSVGText {text} at (10,248) size 105x28 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 105x28
+ chunk 1 text run 1 at (10.00,270.00) startOffset 0 endOffset 10 width 105.00: "hueRotate."
RenderSVGRect {rect} at (0,189) size 221x126 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=200.00] [width=200.00] [height=104.00]
[filter="huenull"] RenderSVGResourceFilter {filter} at (-20,189.60) size 240x124.80
- RenderSVGText {text} at (10,317) size 161x30 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 161x30
- chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 15 width 161.00: "Should be valid"
- RenderSVGText {text} at (10,347) size 116x30 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 116x30
- chunk 1 text run 1 at (10.00,370.00) startOffset 0 endOffset 10 width 116.00: "hueRotate."
+ RenderSVGText {text} at (10,318) size 148x28 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 148x28
+ chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 15 width 148.00: "Should be valid"
+ RenderSVGText {text} at (10,348) size 105x28 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 105x28
+ chunk 1 text run 1 at (10.00,370.00) startOffset 0 endOffset 10 width 105.00: "hueRotate."
RenderSVGRect {rect} at (0,290) size 221x119 [fill={[type=SOLID] [color=#00FF00]}] [x=0.00] [y=300.00] [width=200.00] [height=99.00]
[filter="huerange"] RenderSVGResourceFilter {filter} at (-20,290.10) size 240x118.80
RenderSVGRect {rect} at (182,0) size 236x108 [fill={[type=SOLID] [color=#FF0000]}] [x=202.00] [y=2.00] [width=196.00] [height=96.00]
[filter="matbad"] RenderSVGResourceFilter {filter} at (182.40,-7.60) size 235.20x115.20
- RenderSVGText {text} at (210,17) size 140x30 contains 1 chunk(s)
- [filter="matbad"] RenderSVGResourceFilter {filter} at (196,14) size 168x36
- RenderSVGInlineText {#text} at (0,0) size 140x30
- [filter="matbad"] RenderSVGResourceFilter {filter} at (196,14) size 168x36
- chunk 1 text run 1 at (210.00,40.00) startOffset 0 endOffset 14 width 140.00: "Invalid matrix"
- RenderSVGText {text} at (210,47) size 168x30 contains 1 chunk(s)
- [filter="matbad"] RenderSVGResourceFilter {filter} at (193.20,44) size 201.60x36
- RenderSVGInlineText {#text} at (0,0) size 168x30
- [filter="matbad"] RenderSVGResourceFilter {filter} at (193.20,44) size 201.60x36
- chunk 1 text run 1 at (210.00,70.00) startOffset 0 endOffset 17 width 168.00: "values attribute."
+ RenderSVGText {text} at (210,18) size 135x28 contains 1 chunk(s)
+ [filter="matbad"] RenderSVGResourceFilter {filter} at (196.50,15.20) size 162x33.60
+ RenderSVGInlineText {#text} at (0,0) size 135x28
+ [filter="matbad"] RenderSVGResourceFilter {filter} at (196.50,15.20) size 162x33.60
+ chunk 1 text run 1 at (210.00,40.00) startOffset 0 endOffset 14 width 135.00: "Invalid matrix"
+ RenderSVGText {text} at (210,48) size 154x28 contains 1 chunk(s)
+ [filter="matbad"] RenderSVGResourceFilter {filter} at (194.60,45.20) size 184.80x33.60
+ RenderSVGInlineText {#text} at (0,0) size 154x28
+ [filter="matbad"] RenderSVGResourceFilter {filter} at (194.60,45.20) size 184.80x33.60
+ chunk 1 text run 1 at (210.00,70.00) startOffset 0 endOffset 17 width 154.00: "values attribute."
RenderSVGRect {rect} at (182,92) size 236x116 [fill={[type=SOLID] [color=#FF0000]}] [x=202.00] [y=102.00] [width=196.00] [height=96.00]
[filter="huebad"] RenderSVGResourceFilter {filter} at (182.40,92.40) size 235.20x115.20
- RenderSVGText {text} at (210,117) size 161x30 contains 1 chunk(s)
- [filter="huebad"] RenderSVGResourceFilter {filter} at (193.90,114) size 193.20x36
- RenderSVGInlineText {#text} at (0,0) size 161x30
- [filter="huebad"] RenderSVGResourceFilter {filter} at (193.90,114) size 193.20x36
- chunk 1 text run 1 at (210.00,140.00) startOffset 0 endOffset 16 width 161.00: "Invalid saturate"
- RenderSVGText {text} at (210,147) size 168x30 contains 1 chunk(s)
- [filter="huebad"] RenderSVGResourceFilter {filter} at (193.20,144) size 201.60x36
- RenderSVGInlineText {#text} at (0,0) size 168x30
- [filter="huebad"] RenderSVGResourceFilter {filter} at (193.20,144) size 201.60x36
- chunk 1 text run 1 at (210.00,170.00) startOffset 0 endOffset 17 width 168.00: "values attribute."
+ RenderSVGText {text} at (210,118) size 149x28 contains 1 chunk(s)
+ [filter="huebad"] RenderSVGResourceFilter {filter} at (195.10,115.20) size 178.80x33.60
+ RenderSVGInlineText {#text} at (0,0) size 149x28
+ [filter="huebad"] RenderSVGResourceFilter {filter} at (195.10,115.20) size 178.80x33.60
+ chunk 1 text run 1 at (210.00,140.00) startOffset 0 endOffset 16 width 149.00: "Invalid saturate"
+ RenderSVGText {text} at (210,148) size 154x28 contains 1 chunk(s)
+ [filter="huebad"] RenderSVGResourceFilter {filter} at (194.60,145.20) size 184.80x33.60
+ RenderSVGInlineText {#text} at (0,0) size 154x28
+ [filter="huebad"] RenderSVGResourceFilter {filter} at (194.60,145.20) size 184.80x33.60
+ chunk 1 text run 1 at (210.00,170.00) startOffset 0 endOffset 17 width 154.00: "values attribute."
RenderSVGRect {rect} at (182,192) size 236x116 [fill={[type=SOLID] [color=#FF0000]}] [x=202.00] [y=202.00] [width=196.00] [height=96.00]
[filter="satbad"] RenderSVGResourceFilter {filter} at (182.40,192.40) size 235.20x115.20
- RenderSVGText {text} at (210,217) size 184x30 contains 1 chunk(s)
- [filter="satbad"] RenderSVGResourceFilter {filter} at (191.60,214) size 220.80x36
- RenderSVGInlineText {#text} at (0,0) size 184x30
- [filter="satbad"] RenderSVGResourceFilter {filter} at (191.60,214) size 220.80x36
- chunk 1 text run 1 at (210.00,240.00) startOffset 0 endOffset 17 width 184.00: "Invalid hueRotate"
- RenderSVGText {text} at (210,247) size 168x30 contains 1 chunk(s)
- [filter="satbad"] RenderSVGResourceFilter {filter} at (193.20,244) size 201.60x36
- RenderSVGInlineText {#text} at (0,0) size 168x30
- [filter="satbad"] RenderSVGResourceFilter {filter} at (193.20,244) size 201.60x36
- chunk 1 text run 1 at (210.00,270.00) startOffset 0 endOffset 17 width 168.00: "values attribute."
+ RenderSVGText {text} at (210,218) size 172x28 contains 1 chunk(s)
+ [filter="satbad"] RenderSVGResourceFilter {filter} at (192.80,215.20) size 206.40x33.60
+ RenderSVGInlineText {#text} at (0,0) size 172x28
+ [filter="satbad"] RenderSVGResourceFilter {filter} at (192.80,215.20) size 206.40x33.60
+ chunk 1 text run 1 at (210.00,240.00) startOffset 0 endOffset 17 width 172.00: "Invalid hueRotate"
+ RenderSVGText {text} at (210,248) size 154x28 contains 1 chunk(s)
+ [filter="satbad"] RenderSVGResourceFilter {filter} at (194.60,245.20) size 184.80x33.60
+ RenderSVGInlineText {#text} at (0,0) size 154x28
+ [filter="satbad"] RenderSVGResourceFilter {filter} at (194.60,245.20) size 184.80x33.60
+ chunk 1 text run 1 at (210.00,270.00) startOffset 0 endOffset 17 width 154.00: "values attribute."
RenderSVGRect {rect} at (182,292) size 236x116 [fill={[type=SOLID] [color=#FF0000]}] [x=202.00] [y=302.00] [width=196.00] [height=96.00]
[filter="satrange"] RenderSVGResourceFilter {filter} at (182.40,292.40) size 235.20x115.20
- RenderSVGText {text} at (210,317) size 149x30 contains 1 chunk(s)
- [filter="satrange"] RenderSVGResourceFilter {filter} at (195.10,314) size 178.80x36
- RenderSVGInlineText {#text} at (0,0) size 149x30
- [filter="satrange"] RenderSVGResourceFilter {filter} at (195.10,314) size 178.80x36
- chunk 1 text run 1 at (210.00,340.00) startOffset 0 endOffset 13 width 149.00: "Saturate must"
- RenderSVGText {text} at (210,347) size 167x30 contains 1 chunk(s)
- [filter="satrange"] RenderSVGResourceFilter {filter} at (193.30,344) size 200.40x36
- RenderSVGInlineText {#text} at (0,0) size 167x30
- [filter="satrange"] RenderSVGResourceFilter {filter} at (193.30,344) size 200.40x36
- chunk 1 text run 1 at (210.00,370.00) startOffset 0 endOffset 15 width 167.00: "have one value."
+ RenderSVGText {text} at (210,318) size 131x28 contains 1 chunk(s)
+ [filter="satrange"] RenderSVGResourceFilter {filter} at (196.90,315.20) size 157.20x33.60
+ RenderSVGInlineText {#text} at (0,0) size 131x28
+ [filter="satrange"] RenderSVGResourceFilter {filter} at (196.90,315.20) size 157.20x33.60
+ chunk 1 text run 1 at (210.00,340.00) startOffset 0 endOffset 13 width 131.00: "Saturate must"
+ RenderSVGText {text} at (210,348) size 151x28 contains 1 chunk(s)
+ [filter="satrange"] RenderSVGResourceFilter {filter} at (194.90,345.20) size 181.20x33.60
+ RenderSVGInlineText {#text} at (0,0) size 151x28
+ [filter="satrange"] RenderSVGResourceFilter {filter} at (194.90,345.20) size 181.20x33.60
+ chunk 1 text run 1 at (210.00,370.00) startOffset 0 endOffset 15 width 151.00: "have one value."
diff --git a/LayoutTests/platform/qt/svg/filters/feComposite-expected.png b/LayoutTests/platform/qt/svg/filters/feComposite-expected.png
new file mode 100644
index 0000000..68660eb
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/filters/feComposite-expected.png
Binary files differ
diff --git a/LayoutTests/platform/qt/svg/filters/feComposite-expected.txt b/LayoutTests/platform/qt/svg/filters/feComposite-expected.txt
index 97a82606..0bc93b4 100644
--- a/LayoutTests/platform/qt/svg/filters/feComposite-expected.txt
+++ b/LayoutTests/platform/qt/svg/filters/feComposite-expected.txt
@@ -1,7 +1,7 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 400x400
- RenderSVGRoot {svg} at (10,10) size 189x185
+ RenderSVGRoot {svg} at (10,10) size 178x184
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceFilter {filter} [id="over"] [filterUnits=objectBoundingBox] [primitiveUnits=objectBoundingBox]
[feComposite operation="OVER"]
@@ -29,31 +29,31 @@
[feFlood flood-color="#FF0000" flood-opacity="0.20"]
RenderSVGRect {rect} at (10,10) size 50x50 [fill={[type=SOLID] [color=#000000]}] [x=10.00] [y=10.00] [width=50.00] [height=50.00]
[filter="over"] RenderSVGResourceFilter {filter} at (10,10) size 50x50
- RenderSVGText {text} at (10,74) size 31x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 31x21
- chunk 1 text run 1 at (10.00,90.00) startOffset 0 endOffset 4 width 31.00: "over"
+ RenderSVGText {text} at (10,75) size 27x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 27x19
+ chunk 1 text run 1 at (10.00,90.00) startOffset 0 endOffset 4 width 27.00: "over"
RenderSVGRect {rect} at (70,10) size 50x50 [fill={[type=SOLID] [color=#000000]}] [x=70.00] [y=10.00] [width=50.00] [height=50.00]
[filter="in"] RenderSVGResourceFilter {filter} at (70,10) size 50x50
- RenderSVGText {text} at (70,74) size 13x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 13x21
- chunk 1 text run 1 at (70.00,90.00) startOffset 0 endOffset 2 width 13.00: "in"
+ RenderSVGText {text} at (70,75) size 10x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 10x19
+ chunk 1 text run 1 at (70.00,90.00) startOffset 0 endOffset 2 width 10.00: "in"
RenderSVGRect {rect} at (130,10) size 50x50 [fill={[type=SOLID] [color=#000000]}] [x=130.00] [y=10.00] [width=50.00] [height=50.00]
[filter="out"] RenderSVGResourceFilter {filter} at (130,10) size 50x50
- RenderSVGText {text} at (130,74) size 22x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 22x21
- chunk 1 text run 1 at (130.00,90.00) startOffset 0 endOffset 3 width 22.00: "out"
+ RenderSVGText {text} at (130,75) size 19x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 19x19
+ chunk 1 text run 1 at (130.00,90.00) startOffset 0 endOffset 3 width 19.00: "out"
RenderSVGRect {rect} at (10,110) size 50x50 [fill={[type=SOLID] [color=#000000]}] [x=10.00] [y=110.00] [width=50.00] [height=50.00]
[filter="atop"] RenderSVGResourceFilter {filter} at (10,110) size 50x50
- RenderSVGText {text} at (10,174) size 31x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 31x21
- chunk 1 text run 1 at (10.00,190.00) startOffset 0 endOffset 4 width 31.00: "atop"
+ RenderSVGText {text} at (10,175) size 27x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 27x19
+ chunk 1 text run 1 at (10.00,190.00) startOffset 0 endOffset 4 width 27.00: "atop"
RenderSVGRect {rect} at (70,110) size 50x50 [fill={[type=SOLID] [color=#000000]}] [x=70.00] [y=110.00] [width=50.00] [height=50.00]
[filter="xor"] RenderSVGResourceFilter {filter} at (70,110) size 50x50
- RenderSVGText {text} at (70,174) size 22x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 22x21
- chunk 1 text run 1 at (70.00,190.00) startOffset 0 endOffset 3 width 22.00: "xor"
+ RenderSVGText {text} at (70,175) size 20x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 20x19
+ chunk 1 text run 1 at (70.00,190.00) startOffset 0 endOffset 3 width 20.00: "xor"
RenderSVGRect {rect} at (130,110) size 50x50 [fill={[type=SOLID] [color=#000000]}] [x=130.00] [y=110.00] [width=50.00] [height=50.00]
[filter="arithmetic"] RenderSVGResourceFilter {filter} at (130,110) size 50x50
- RenderSVGText {text} at (130,174) size 69x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 69x21
- chunk 1 text run 1 at (130.00,190.00) startOffset 0 endOffset 10 width 69.00: "arithmetic"
+ RenderSVGText {text} at (130,175) size 58x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 58x19
+ chunk 1 text run 1 at (130.00,190.00) startOffset 0 endOffset 10 width 58.00: "arithmetic"
diff --git a/LayoutTests/platform/qt/svg/filters/filter-on-filter-for-text-expected.png b/LayoutTests/platform/qt/svg/filters/filter-on-filter-for-text-expected.png
index feace10..422ef8c 100644
--- a/LayoutTests/platform/qt/svg/filters/filter-on-filter-for-text-expected.png
+++ b/LayoutTests/platform/qt/svg/filters/filter-on-filter-for-text-expected.png
Binary files differ
diff --git a/LayoutTests/platform/qt/svg/filters/filter-on-filter-for-text-expected.txt b/LayoutTests/platform/qt/svg/filters/filter-on-filter-for-text-expected.txt
index b2e7822..94d7ee3 100644
--- a/LayoutTests/platform/qt/svg/filters/filter-on-filter-for-text-expected.txt
+++ b/LayoutTests/platform/qt/svg/filters/filter-on-filter-for-text-expected.txt
@@ -1,20 +1,20 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (9,7) size 251x32
+ RenderSVGRoot {svg} at (10,9) size 239x29
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceFilter {filter} [id="filter"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
[feGaussianBlur stdDeviation="1.00, 1.00"]
[SourceGraphic]
- RenderSVGText {text} at (30,10) size 209x26 contains 1 chunk(s)
- [filter="filter"] RenderSVGResourceFilter {filter} at (9.10,7.40) size 250.80x31.20
- RenderSVGInlineText {#text} at (0,0) size 137x26
- [filter="filter"] RenderSVGResourceFilter {filter} at (16.30,7.40) size 164.40x31.20
- chunk 1 text run 1 at (30.00,30.00) startOffset 0 endOffset 19 width 137.00: "This is for filter "
- RenderSVGTSpan {tspan} at (0,0) size 66x26
- RenderSVGInlineText {#text} at (137,0) size 66x26
- [filter="filter"] RenderSVGResourceFilter {filter} at (160.40,7.40) size 79.20x31.20
- chunk 1 text run 1 at (167.00,30.00) startOffset 0 endOffset 9 width 66.00: "on filter"
- RenderSVGInlineText {#text} at (203,0) size 6x26
- [filter="filter"] RenderSVGResourceFilter {filter} at (232.40,7.40) size 7.20x31.20
- chunk 1 text run 1 at (233.00,30.00) startOffset 0 endOffset 1 width 6.00: "."
+ RenderSVGText {text} at (30,12) size 199x23 contains 1 chunk(s)
+ [filter="filter"] RenderSVGResourceFilter {filter} at (10.10,9.70) size 238.80x27.60
+ RenderSVGInlineText {#text} at (0,0) size 131x23
+ [filter="filter"] RenderSVGResourceFilter {filter} at (16.90,9.70) size 157.20x27.60
+ chunk 1 text run 1 at (30.00,30.00) startOffset 0 endOffset 19 width 131.00: "This is for filter "
+ RenderSVGTSpan {tspan} at (0,0) size 63x23
+ RenderSVGInlineText {#text} at (131,0) size 63x23
+ [filter="filter"] RenderSVGResourceFilter {filter} at (154.70,9.70) size 75.60x27.60
+ chunk 1 text run 1 at (161.00,30.00) startOffset 0 endOffset 9 width 63.00: "on filter"
+ RenderSVGInlineText {#text} at (194,0) size 5x23
+ [filter="filter"] RenderSVGResourceFilter {filter} at (223.50,9.70) size 6x27.60
+ chunk 1 text run 1 at (224.00,30.00) startOffset 0 endOffset 1 width 5.00: "."
diff --git a/LayoutTests/platform/qt/svg/filters/filter-on-tspan-expected.png b/LayoutTests/platform/qt/svg/filters/filter-on-tspan-expected.png
index f7a9f27..356691d 100644
--- a/LayoutTests/platform/qt/svg/filters/filter-on-tspan-expected.png
+++ b/LayoutTests/platform/qt/svg/filters/filter-on-tspan-expected.png
Binary files differ
diff --git a/LayoutTests/platform/qt/svg/filters/filter-on-tspan-expected.txt b/LayoutTests/platform/qt/svg/filters/filter-on-tspan-expected.txt
index 275ba88..5a17b98 100644
--- a/LayoutTests/platform/qt/svg/filters/filter-on-tspan-expected.txt
+++ b/LayoutTests/platform/qt/svg/filters/filter-on-tspan-expected.txt
@@ -1,16 +1,16 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (100,84) size 110x21
+ RenderSVGRoot {svg} at (100,85) size 93x19
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceFilter {filter} [id="filter"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
[feFlood flood-color="#008000" flood-opacity="1.00"]
- RenderSVGText {text} at (100,84) size 110x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 75x21
- chunk 1 text run 1 at (100.00,100.00) startOffset 0 endOffset 12 width 75.00: "Die ist ein "
- RenderSVGTSpan {tspan} at (0,0) size 31x21
- RenderSVGInlineText {#text} at (75,0) size 31x21
- [filter="filter"] RenderSVGResourceFilter {filter} at (171.90,81.90) size 37.20x25.20
- chunk 1 text run 1 at (175.00,100.00) startOffset 0 endOffset 4 width 31.00: "Test"
- RenderSVGInlineText {#text} at (106,0) size 4x21
- chunk 1 text run 1 at (206.00,100.00) startOffset 0 endOffset 1 width 4.00: "."
+ RenderSVGText {text} at (100,85) size 93x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 63x19
+ chunk 1 text run 1 at (100.00,100.00) startOffset 0 endOffset 12 width 63.00: "Die ist ein "
+ RenderSVGTSpan {tspan} at (0,0) size 26x19
+ RenderSVGInlineText {#text} at (63,0) size 26x19
+ [filter="filter"] RenderSVGResourceFilter {filter} at (160.40,83.10) size 31.20x22.80
+ chunk 1 text run 1 at (163.00,100.00) startOffset 0 endOffset 4 width 26.00: "Test"
+ RenderSVGInlineText {#text} at (89,0) size 4x19
+ chunk 1 text run 1 at (189.00,100.00) startOffset 0 endOffset 1 width 4.00: "."
diff --git a/LayoutTests/platform/qt/svg/filters/filter-width-update-expected.png b/LayoutTests/platform/qt/svg/filters/filter-width-update-expected.png
index bda1c98..099adfd 100644
--- a/LayoutTests/platform/qt/svg/filters/filter-width-update-expected.png
+++ b/LayoutTests/platform/qt/svg/filters/filter-width-update-expected.png
Binary files differ
diff --git a/LayoutTests/platform/qt/svg/filters/filter-width-update-expected.txt b/LayoutTests/platform/qt/svg/filters/filter-width-update-expected.txt
index 1181836..05d8cbd 100644
--- a/LayoutTests/platform/qt/svg/filters/filter-width-update-expected.txt
+++ b/LayoutTests/platform/qt/svg/filters/filter-width-update-expected.txt
@@ -1,13 +1,13 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (0,0) size 534x155
+ RenderSVGRoot {svg} at (0,0) size 458x154
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceFilter {filter} [id="blur"] [filterUnits=userSpaceOnUse] [primitiveUnits=userSpaceOnUse]
[feGaussianBlur stdDeviation="10.00, 10.00"]
[SourceGraphic]
RenderSVGRect {rect} at (0,0) size 140x140 [fill={[type=SOLID] [color=#008000]}] [x=20.00] [y=20.00] [width=100.00] [height=100.00]
[filter="blur"] RenderSVGResourceFilter {filter} at (0,0) size 140x140
- RenderSVGText {text} at (0,134) size 534x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 534x21
- chunk 1 text run 1 at (0.00,150.00) startOffset 0 endOffset 74 width 534.00: "You should see a green, blurred rectangle from 20x20 with width/height 100"
+ RenderSVGText {text} at (0,135) size 458x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 458x19
+ chunk 1 text run 1 at (0.00,150.00) startOffset 0 endOffset 74 width 458.00: "You should see a green, blurred rectangle from 20x20 with width/height 100"
diff --git a/LayoutTests/platform/qt/svg/filters/sourceAlpha-expected.png b/LayoutTests/platform/qt/svg/filters/sourceAlpha-expected.png
new file mode 100644
index 0000000..f0d3fc8
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/filters/sourceAlpha-expected.png
Binary files differ
diff --git a/LayoutTests/platform/qt/svg/filters/sourceAlpha-expected.txt b/LayoutTests/platform/qt/svg/filters/sourceAlpha-expected.txt
index 8e7d8f6..875a8ea 100644
--- a/LayoutTests/platform/qt/svg/filters/sourceAlpha-expected.txt
+++ b/LayoutTests/platform/qt/svg/filters/sourceAlpha-expected.txt
@@ -1,13 +1,13 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (41,5) size 103x63
+ RenderSVGRoot {svg} at (42,9) size 95x55
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceFilter {filter} [id="filter"] [filterUnits=objectBoundingBox] [primitiveUnits=userSpaceOnUse]
[feOffset dx="0.00" dy="0.00"]
[SourceAlpha]
- RenderSVGContainer {g} at (41,5) size 103x63
- [filter="filter"] RenderSVGResourceFilter {filter} at (41.50,5.90) size 102x61.20
- RenderSVGText {text} at (50,11) size 85x51 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 85x51
- chunk 1 text run 1 at (50.00,50.00) startOffset 0 endOffset 3 width 85.00: "SVG"
+ RenderSVGContainer {g} at (42,9) size 95x55
+ [filter="filter"] RenderSVGResourceFilter {filter} at (42.10,9.50) size 94.80x54
+ RenderSVGText {text} at (50,14) size 79x45 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 79x45
+ chunk 1 text run 1 at (50.00,50.00) startOffset 0 endOffset 3 width 79.00: "SVG"
diff --git a/LayoutTests/platform/qt/svg/foreignObject/fO-parent-display-changes-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/fO-parent-display-changes-expected.txt
index 7c72544..e7d39d7 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/fO-parent-display-changes-expected.txt
+++ b/LayoutTests/platform/qt/svg/foreignObject/fO-parent-display-changes-expected.txt
@@ -8,5 +8,5 @@
RenderSVGRect {rect} at (0,0) size 100x90 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=90.00]
layer at (0,0) size 100x100
RenderBody {body} at (0,0) size 100x100 [color=#FFFFFF]
- RenderText {#text} at (0,0) size 44x21
- text run at (0,0) width 44: "PASS"
+ RenderText {#text} at (0,0) size 38x19
+ text run at (0,0) width 38: "PASS"
diff --git a/LayoutTests/platform/qt/svg/foreignObject/fO-parent-display-none-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/fO-parent-display-none-expected.txt
index 5ff4915..2d34ab5 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/fO-parent-display-none-expected.txt
+++ b/LayoutTests/platform/qt/svg/foreignObject/fO-parent-display-none-expected.txt
@@ -6,7 +6,7 @@
RenderSVGForeignObject {foreignObject} at (0,0) size 0x0
RenderBlock {html} at (0,0) size 0x100
RenderBody {body} at (0,0) size 100x100 [color=#FF0000]
- RenderText {#text} at (0,0) size 75x42
- text run at (0,0) width 75: "FAILED IF"
- text run at (0,21) width 61: "VISIBLE"
+ RenderText {#text} at (0,0) size 72x38
+ text run at (0,0) width 72: "FAILED IF"
+ text run at (0,19) width 58: "VISIBLE"
RenderSVGRect {rect} at (0,0) size 100x90 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=90.00]
diff --git a/LayoutTests/platform/qt/svg/foreignObject/fO-parent-display-none-with-relative-pos-content-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/fO-parent-display-none-with-relative-pos-content-expected.txt
index 5ff4915..2d34ab5 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/fO-parent-display-none-with-relative-pos-content-expected.txt
+++ b/LayoutTests/platform/qt/svg/foreignObject/fO-parent-display-none-with-relative-pos-content-expected.txt
@@ -6,7 +6,7 @@
RenderSVGForeignObject {foreignObject} at (0,0) size 0x0
RenderBlock {html} at (0,0) size 0x100
RenderBody {body} at (0,0) size 100x100 [color=#FF0000]
- RenderText {#text} at (0,0) size 75x42
- text run at (0,0) width 75: "FAILED IF"
- text run at (0,21) width 61: "VISIBLE"
+ RenderText {#text} at (0,0) size 72x38
+ text run at (0,0) width 72: "FAILED IF"
+ text run at (0,19) width 58: "VISIBLE"
RenderSVGRect {rect} at (0,0) size 100x90 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=90.00]
diff --git a/LayoutTests/platform/qt/svg/foreignObject/fO-parent-of-parent-display-none-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/fO-parent-of-parent-display-none-expected.txt
index 795350e..e59f9df 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/fO-parent-of-parent-display-none-expected.txt
+++ b/LayoutTests/platform/qt/svg/foreignObject/fO-parent-of-parent-display-none-expected.txt
@@ -7,7 +7,7 @@
RenderSVGForeignObject {foreignObject} at (0,0) size 0x0
RenderBlock {html} at (0,0) size 0x100
RenderBody {body} at (0,0) size 100x100 [color=#FF0000]
- RenderText {#text} at (0,0) size 75x42
- text run at (0,0) width 75: "FAILED IF"
- text run at (0,21) width 61: "VISIBLE"
+ RenderText {#text} at (0,0) size 72x38
+ text run at (0,0) width 72: "FAILED IF"
+ text run at (0,19) width 58: "VISIBLE"
RenderSVGRect {rect} at (0,0) size 100x90 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=90.00]
diff --git a/LayoutTests/platform/qt/svg/foreignObject/fO-parent-of-parent-display-none-with-relative-pos-content-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/fO-parent-of-parent-display-none-with-relative-pos-content-expected.txt
index 795350e..e59f9df 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/fO-parent-of-parent-display-none-with-relative-pos-content-expected.txt
+++ b/LayoutTests/platform/qt/svg/foreignObject/fO-parent-of-parent-display-none-with-relative-pos-content-expected.txt
@@ -7,7 +7,7 @@
RenderSVGForeignObject {foreignObject} at (0,0) size 0x0
RenderBlock {html} at (0,0) size 0x100
RenderBody {body} at (0,0) size 100x100 [color=#FF0000]
- RenderText {#text} at (0,0) size 75x42
- text run at (0,0) width 75: "FAILED IF"
- text run at (0,21) width 61: "VISIBLE"
+ RenderText {#text} at (0,0) size 72x38
+ text run at (0,0) width 72: "FAILED IF"
+ text run at (0,19) width 58: "VISIBLE"
RenderSVGRect {rect} at (0,0) size 100x90 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=100.00] [height=90.00]
diff --git a/LayoutTests/platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.png b/LayoutTests/platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.png
index c975874..7f7eaa2 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.png
+++ b/LayoutTests/platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.png
Binary files differ
diff --git a/LayoutTests/platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
index 586b0e4..8f3a7f5 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
+++ b/LayoutTests/platform/qt/svg/foreignObject/no-crash-with-svg-content-in-html-document-expected.txt
@@ -3,10 +3,10 @@
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x100
RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
- RenderBlock {html} at (0,0) size 300x21
- RenderBlock {p} at (0,0) size 300x21
- RenderText {#text} at (0,0) size 152x21
- text run at (0,0) width 152: "This should not crash"
- RenderBlock (anonymous) at (0,37) size 300x0
+ RenderBlock {html} at (0,0) size 300x19
+ RenderBlock {p} at (0,0) size 300x19
+ RenderText {#text} at (0,0) size 127x19
+ text run at (0,0) width 127: "This should not crash"
+ RenderBlock (anonymous) at (0,35) size 300x0
RenderInline {g} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt
index adabfb5..bb3d9dd 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt
+++ b/LayoutTests/platform/qt/svg/foreignObject/svg-document-as-direct-child-expected.txt
@@ -3,11 +3,11 @@
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x250
RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
- RenderSVGRoot {svg} at (0,4) size 39x21
- RenderSVGContainer {g} at (0,4) size 39x21
- RenderSVGText {text} at (0,4) size 39x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 39x21
- chunk 1 text run 1 at (0.00,20.00) startOffset 0 endOffset 5 width 39.00: "crash"
+ RenderSVGRoot {svg} at (0,5) size 32x19
+ RenderSVGContainer {g} at (0,5) size 32x19
+ RenderSVGText {text} at (0,5) size 32x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 32x19
+ chunk 1 text run 1 at (0.00,20.00) startOffset 0 endOffset 5 width 32.00: "crash"
RenderText {#text} at (0,0) size 0x0
RenderSVGForeignObject {foreignObject} at (0,50) size 300x100
RenderSVGRoot {svg} at (0,50) size 100x100
diff --git a/LayoutTests/platform/qt/svg/foreignObject/svg-document-in-html-document-expected.png b/LayoutTests/platform/qt/svg/foreignObject/svg-document-in-html-document-expected.png
index 5f2b47b..3f31a7f 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/svg-document-in-html-document-expected.png
+++ b/LayoutTests/platform/qt/svg/foreignObject/svg-document-in-html-document-expected.png
Binary files differ
diff --git a/LayoutTests/platform/qt/svg/foreignObject/svg-document-in-html-document-expected.txt b/LayoutTests/platform/qt/svg/foreignObject/svg-document-in-html-document-expected.txt
index 29d2adb..7ef663b 100644
--- a/LayoutTests/platform/qt/svg/foreignObject/svg-document-in-html-document-expected.txt
+++ b/LayoutTests/platform/qt/svg/foreignObject/svg-document-in-html-document-expected.txt
@@ -3,14 +3,14 @@
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (0,0) size 300x100
RenderSVGForeignObject {foreignObject} at (0,0) size 300x100
- RenderBlock {html} at (0,0) size 300x642
- RenderBlock {p} at (0,0) size 300x21
- RenderText {#text} at (0,0) size 230x21
- text run at (0,0) width 230: "Test from HTML in foreignObject"
- RenderBlock (anonymous) at (0,37) size 300x605
- RenderSVGRoot {svg} at (0,37) size 285x55
- RenderSVGRect {rect} at (0,37) size 20x20 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=20.00] [height=20.00]
- RenderSVGText {text} at (0,34) size 285x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 285x21
- chunk 1 text run 1 at (0.00,50.00) startOffset 0 endOffset 38 width 285.00: "Test from SVG in HTML in foreignObject"
+ RenderBlock {html} at (0,0) size 300x639
+ RenderBlock {p} at (0,0) size 300x19
+ RenderText {#text} at (0,0) size 206x19
+ text run at (0,0) width 206: "Test from HTML in foreignObject"
+ RenderBlock (anonymous) at (0,35) size 300x604
+ RenderSVGRoot {svg} at (0,35) size 255x54
+ RenderSVGRect {rect} at (0,35) size 20x20 [fill={[type=SOLID] [color=#008000]}] [x=0.00] [y=0.00] [width=20.00] [height=20.00]
+ RenderSVGText {text} at (0,35) size 255x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 255x19
+ chunk 1 text run 1 at (0.00,50.00) startOffset 0 endOffset 38 width 255.00: "Test from SVG in HTML in foreignObject"
RenderText {#text} at (0,0) size 0x0
