Diff
Modified: trunk/LayoutTests/ChangeLog (123522 => 123523)
--- trunk/LayoutTests/ChangeLog 2012-07-24 20:44:43 UTC (rev 123522)
+++ trunk/LayoutTests/ChangeLog 2012-07-24 20:46:31 UTC (rev 123523)
@@ -1,3 +1,33 @@
+2012-07-24 Caio Marcelo de Oliveira Filho <[email protected]>
+
+ [Qt] svg/clip-path rebaseline after new test fonts
+ https://bugs.webkit.org/show_bug.cgi?id=92158
+
+ Unreviewed.
+
+ Create a separate bug to track two tests that had wrong expected results before
+ the font change.
+
+ * platform/qt-5.0/Skipped:
+ * platform/qt/svg/clip-path/clip-path-pixelation-expected.png:
+ * platform/qt/svg/clip-path/clip-path-pixelation-expected.txt:
+ * platform/qt/svg/clip-path/clip-path-text-and-shape-expected.png:
+ * platform/qt/svg/clip-path/clip-path-text-and-shape-expected.txt:
+ * platform/qt/svg/clip-path/clip-path-text-and-stroke-expected.png:
+ * platform/qt/svg/clip-path/clip-path-text-and-stroke-expected.txt:
+ * platform/qt/svg/clip-path/clip-path-text-expected.png:
+ * platform/qt/svg/clip-path/clip-path-text-expected.txt:
+ * platform/qt/svg/clip-path/clip-path-tspan-and-stroke-expected.png:
+ * platform/qt/svg/clip-path/clip-path-tspan-and-stroke-expected.txt:
+ * platform/qt/svg/clip-path/clip-path-with-text-clipped-expected.png:
+ * platform/qt/svg/clip-path/clip-path-with-text-clipped-expected.txt:
+ * platform/qt/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png:
+ * platform/qt/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.txt:
+ * platform/qt/svg/clip-path/deep-nested-clip-in-mask-expected.png: Removed.
+ * platform/qt/svg/clip-path/deep-nested-clip-in-mask-expected.txt: Removed.
+ * platform/qt/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png: Removed.
+ * platform/qt/svg/clip-path/deep-nested-clip-in-mask-panning-expected.txt: Removed.
+
2012-07-24 Zhenyao Mo <[email protected]>
Rebaseline - gardening stuff.
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-pixelation-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-pixelation-expected.txt (123522 => 123523)
--- trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-pixelation-expected.txt 2012-07-24 20:44:43 UTC (rev 123522)
+++ trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-pixelation-expected.txt 2012-07-24 20:46:31 UTC (rev 123523)
@@ -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 (25,4) size 250x296
+ RenderSVGRoot {svg} at (25,5) size 250x295
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceClipper {clipPath} [id="clip-circle"] [clipPathUnits=objectBoundingBox]
RenderSVGEllipse {circle} at (0,0) size 1x1 [fill={[type=SOLID] [color=#000000]}] [cx=0.25] [cy=0.25] [r=0.25]
RenderSVGEllipse {circle} at (0,0) size 1x1 [fill={[type=SOLID] [color=#000000]}] [cx=0.75] [cy=0.75] [r=0.25]
- RenderSVGText {text} at (44,4) size 212x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 212x21
- chunk 1 (middle anchor) text run 1 at (44.00,20.00) startOffset 0 endOffset 30 width 212.00: "This should not look pixelated"
+ RenderSVGText {text} at (60,5) size 180x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 180x19
+ chunk 1 (middle anchor) text run 1 at (60.00,20.00) startOffset 0 endOffset 30 width 180.00: "This should not look pixelated"
RenderSVGRect {rect} at (25,50) size 250x250 [transform={m=((25.00,0.00)(0.00,25.00)) t=(0.00,0.00)}] [fill={[type=SOLID] [color=#008000]}] [x=1.00] [y=2.00] [width=10.00] [height=10.00]
[clipPath="clip-circle"] RenderSVGResourceClipper {clipPath} at (1,2) size 10x10
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-text-and-shape-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-text-and-shape-expected.txt (123522 => 123523)
--- trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-text-and-shape-expected.txt 2012-07-24 20:44:43 UTC (rev 123522)
+++ trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-text-and-shape-expected.txt 2012-07-24 20:46:31 UTC (rev 123523)
@@ -5,9 +5,9 @@
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGPath {path} at (40,40) size 200x170 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,40.00)}] [fill={[type=SOLID] [color=#000000]}] [data="" 100 0 L 160 170 L 0 60 L 200 60 L 30 170 Z"]
RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
- RenderSVGText {text} at (40,81) size 182x104 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 182x104
- chunk 1 text run 1 at (40.00,160.00) startOffset 0 endOffset 4 width 182.00: "CLIP"
+ RenderSVGText {text} at (40,88) size 191x90 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 191x90
+ chunk 1 text run 1 at (40.00,160.00) startOffset 0 endOffset 4 width 191.00: "CLIP"
RenderSVGContainer {use} at (40,40) size 200x170
RenderSVGPath {path} at (40,40) size 200x170 [transform={m=((1.00,0.00)(0.00,1.00)) t=(40.00,40.00)}] [fill={[type=SOLID] [color=#000000]}] [clip rule=EVEN-ODD] [data="" 100 0 L 160 170 L 0 60 L 200 60 L 30 170 Z"]
RenderSVGRect {rect} at (40,40) size 200x170 [fill={[type=SOLID] [color=#008000]}] [x=40.00] [y=40.00] [width=300.00] [height=300.00]
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-text-and-stroke-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-text-and-stroke-expected.txt (123522 => 123523)
--- trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-text-and-stroke-expected.txt 2012-07-24 20:44:43 UTC (rev 123522)
+++ trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-text-and-stroke-expected.txt 2012-07-24 20:46:31 UTC (rev 123523)
@@ -1,11 +1,11 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (40,71) size 192x124
+ RenderSVGRoot {svg} at (40,78) size 201x110
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
- RenderSVGText {text} at (40,81) size 182x104 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 182x104
- chunk 1 text run 1 at (40.00,160.00) startOffset 0 endOffset 4 width 182.00: "CLIP"
- RenderSVGRect {rect} at (40,71) size 192x124 [fill={[type=SOLID] [color=#008000]}] [x=40.00] [y=40.00] [width=300.00] [height=300.00]
- [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (30,71) size 202x124
+ RenderSVGText {text} at (40,88) size 191x90 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 191x90
+ chunk 1 text run 1 at (40.00,160.00) startOffset 0 endOffset 4 width 191.00: "CLIP"
+ RenderSVGRect {rect} at (40,78) size 201x110 [fill={[type=SOLID] [color=#008000]}] [x=40.00] [y=40.00] [width=300.00] [height=300.00]
+ [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (30,78) size 211x110
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-text-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-text-expected.txt (123522 => 123523)
--- trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-text-expected.txt 2012-07-24 20:44:43 UTC (rev 123522)
+++ trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-text-expected.txt 2012-07-24 20:46:31 UTC (rev 123523)
@@ -1,11 +1,11 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (100,71) size 137x78
+ RenderSVGRoot {svg} at (100,76) size 143x67
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
- RenderSVGText {text} at (100,71) size 137x78 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 137x78
- chunk 1 text run 1 at (100.00,130.00) startOffset 0 endOffset 4 width 137.00: "CLIP"
- RenderSVGRect {rect} at (100,71) size 137x78 [fill={[type=SOLID] [color=#008000]}] [x=40.00] [y=40.00] [width=300.00] [height=300.00]
- [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (100,71) size 137x78
+ RenderSVGText {text} at (100,76) size 143x67 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 143x67
+ chunk 1 text run 1 at (100.00,130.00) startOffset 0 endOffset 4 width 143.00: "CLIP"
+ RenderSVGRect {rect} at (100,76) size 143x67 [fill={[type=SOLID] [color=#008000]}] [x=40.00] [y=40.00] [width=300.00] [height=300.00]
+ [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (100,76) size 143x67
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-tspan-and-stroke-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-tspan-and-stroke-expected.txt (123522 => 123523)
--- trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-tspan-and-stroke-expected.txt 2012-07-24 20:44:43 UTC (rev 123522)
+++ trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-tspan-and-stroke-expected.txt 2012-07-24 20:46:31 UTC (rev 123523)
@@ -1,12 +1,12 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (40,81) size 182x104
+ RenderSVGRoot {svg} at (40,88) size 191x90
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
- RenderSVGText {text} at (40,81) size 182x104 contains 1 chunk(s)
- RenderSVGTSpan {tspan} at (0,0) size 182x104
- RenderSVGInlineText {#text} at (0,0) size 182x104
- chunk 1 text run 1 at (40.00,160.00) startOffset 0 endOffset 4 width 182.00: "CLIP"
- RenderSVGRect {rect} at (40,81) size 182x104 [fill={[type=SOLID] [color=#008000]}] [x=40.00] [y=40.00] [width=300.00] [height=300.00]
- [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (40,81) size 182x104
+ RenderSVGText {text} at (40,88) size 191x90 contains 1 chunk(s)
+ RenderSVGTSpan {tspan} at (0,0) size 191x90
+ RenderSVGInlineText {#text} at (0,0) size 191x90
+ chunk 1 text run 1 at (40.00,160.00) startOffset 0 endOffset 4 width 191.00: "CLIP"
+ RenderSVGRect {rect} at (40,88) size 191x90 [fill={[type=SOLID] [color=#008000]}] [x=40.00] [y=40.00] [width=300.00] [height=300.00]
+ [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (40,88) size 191x90
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-with-text-clipped-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-with-text-clipped-expected.txt (123522 => 123523)
--- trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-with-text-clipped-expected.txt 2012-07-24 20:44:43 UTC (rev 123522)
+++ trunk/LayoutTests/platform/qt/svg/clip-path/clip-path-with-text-clipped-expected.txt 2012-07-24 20:46:31 UTC (rev 123523)
@@ -1,15 +1,15 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (80,52) size 228x129
+ RenderSVGRoot {svg} at (80,60) size 239x112
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGPath {path} at (70,40) size 200x170 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,40.00)}] [fill={[type=SOLID] [color=#000000]}] [data="" 100 0 L 160 170 L 0 60 L 200 60 L 30 170 Z"]
RenderSVGResourceClipper {clipPath} [id="clipClip"] [clipPathUnits=userSpaceOnUse]
RenderSVGContainer {use} at (70,40) size 200x170
RenderSVGPath {path} at (70,40) size 200x170 [transform={m=((1.00,0.00)(0.00,1.00)) t=(70.00,40.00)}] [fill={[type=SOLID] [color=#000000]}] [data="" 100 0 L 160 170 L 0 60 L 200 60 L 30 170 Z"]
RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=userSpaceOnUse]
- RenderSVGText {text} at (80,52) size 228x129 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 228x129
- chunk 1 text run 1 at (80.00,150.00) startOffset 0 endOffset 4 width 228.00: "CLIP"
- RenderSVGRect {rect} at (80,52) size 228x129 [fill={[type=SOLID] [color=#008000]}] [x=40.00] [y=40.00] [width=300.00] [height=300.00]
- [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (80,52) size 228x129
+ RenderSVGText {text} at (80,60) size 239x112 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 239x112
+ chunk 1 text run 1 at (80.00,150.00) startOffset 0 endOffset 4 width 239.00: "CLIP"
+ RenderSVGRect {rect} at (80,60) size 239x112 [fill={[type=SOLID] [color=#008000]}] [x=40.00] [y=40.00] [width=300.00] [height=300.00]
+ [clipPath="clip"] RenderSVGResourceClipper {clipPath} at (80,60) size 239x112
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/qt/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.txt (123522 => 123523)
--- trunk/LayoutTests/platform/qt/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.txt 2012-07-24 20:44:43 UTC (rev 123522)
+++ trunk/LayoutTests/platform/qt/svg/clip-path/deep-nested-clip-in-mask-different-unitTypes-expected.txt 2012-07-24 20:46:31 UTC (rev 123523)
@@ -1,7 +1,7 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (0,0) size 245x230
+ RenderSVGRoot {svg} at (0,0) size 226x229
RenderSVGHiddenContainer {defs} at (0,0) size 0x0
RenderSVGResourceClipper {clipPath} [id="clip0"] [clipPathUnits=userSpaceOnUse]
RenderSVGEllipse {circle} at (50,50) size 100x100 [fill={[type=SOLID] [color=#000000]}] [cx=100.00] [cy=100.00] [r=50.00]
@@ -21,9 +21,9 @@
RenderSVGRect {rect} at (0,0) size 1x1 [fill={[type=SOLID] [color=#FFFFFF]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
RenderSVGRect {rect} at (0,0) size 1x1 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
[clipPath="clip"] RenderSVGResourceClipper {clipPath} at (0,0) size 1x1
- RenderSVGText {text} at (5,209) size 239x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 239x21
- chunk 1 (middle anchor) text run 1 at (5.50,225.00) startOffset 0 endOffset 33 width 239.00: "Both shapes should look identical"
+ RenderSVGText {text} at (24,210) size 201x19 contains 1 chunk(s)
+ RenderSVGInlineText {#text} at (0,0) size 201x19
+ chunk 1 (middle anchor) text run 1 at (24.50,225.00) startOffset 0 endOffset 33 width 201.00: "Both shapes should look identical"
RenderSVGEllipse {circle} at (0,0) size 100x100 [fill={[type=SOLID] [color=#000000]}] [cx=50.00] [cy=50.00] [r=50.00]
[masker="mask1"] RenderSVGResourceMasker {mask} at (0,0) size 100x100
RenderSVGEllipse {circle} at (100,100) size 100x100 [fill={[type=SOLID] [color=#000000]}] [cx=150.00] [cy=150.00] [r=50.00]
Deleted: trunk/LayoutTests/platform/qt/svg/clip-path/deep-nested-clip-in-mask-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/svg/clip-path/deep-nested-clip-in-mask-expected.txt (123522 => 123523)
--- trunk/LayoutTests/platform/qt/svg/clip-path/deep-nested-clip-in-mask-expected.txt 2012-07-24 20:44:43 UTC (rev 123522)
+++ trunk/LayoutTests/platform/qt/svg/clip-path/deep-nested-clip-in-mask-expected.txt 2012-07-24 20:46:31 UTC (rev 123523)
@@ -1,41 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (0,0) size 245x230
- RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGResourceClipper {clipPath} [id="clip1"] [clipPathUnits=objectBoundingBox]
- RenderSVGEllipse {circle} at (0,0) size 1x1 [fill={[type=SOLID] [color=#000000]}] [cx=0.00] [cy=0.00] [r=0.50]
- RenderSVGEllipse {circle} at (0,0) size 1x2 [fill={[type=SOLID] [color=#000000]}] [cx=0.00] [cy=1.00] [r=0.50]
- RenderSVGResourceClipper {clipPath} [id="clip2"] [clipPathUnits=objectBoundingBox]
- RenderSVGEllipse {circle} at (0,0) size 2x1 [fill={[type=SOLID] [color=#000000]}] [cx=1.00] [cy=0.00] [r=0.50]
- RenderSVGEllipse {circle} at (0,0) size 2x2 [fill={[type=SOLID] [color=#000000]}] [cx=1.00] [cy=1.00] [r=0.50]
- RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=objectBoundingBox]
- RenderSVGRect {rect} at (0,0) size 1x1 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- [clipPath="clip1"] RenderSVGResourceClipper {clipPath} at (-0.50,-0.50) size 1x2
- RenderSVGRect {rect} at (0,0) size 1x1 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- [clipPath="clip2"] RenderSVGResourceClipper {clipPath} at (0.50,-0.50) size 1x2
- RenderSVGResourceMasker {mask} [id="mask1a"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
- RenderSVGRect {rect} at (0,0) size 1x1 [fill={[type=SOLID] [color=#FFFFFF]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- RenderSVGRect {rect} at (0,0) size 1x1 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- [clipPath="clip1"] RenderSVGResourceClipper {clipPath} at (-0.50,-0.50) size 1x2
- RenderSVGResourceMasker {mask} [id="mask1b"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
- RenderSVGRect {rect} at (0,0) size 1x1 [fill={[type=SOLID] [color=#FFFFFF]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- RenderSVGRect {rect} at (0,0) size 1x1 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- [clipPath="clip2"] RenderSVGResourceClipper {clipPath} at (0.50,-0.50) size 1x2
- RenderSVGResourceMasker {mask} [id="mask2"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
- RenderSVGRect {rect} at (0,0) size 1x1 [fill={[type=SOLID] [color=#FFFFFF]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- [masker="mask1a"] RenderSVGResourceMasker {mask} at (0,0) size 1x1
- RenderSVGResourceMasker {mask} [id="mask3"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
- RenderSVGRect {rect} at (0,0) size 1x1 [fill={[type=SOLID] [color=#FFFFFF]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- [masker="mask1b"] RenderSVGResourceMasker {mask} at (0,0) size 1x1
- RenderSVGText {text} at (5,209) size 239x21 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 239x21
- chunk 1 (middle anchor) text run 1 at (5.50,225.00) startOffset 0 endOffset 33 width 239.00: "Both shapes should look identical"
- RenderSVGContainer {g} at (0,0) size 100x100
- [masker="mask1a"] RenderSVGResourceMasker {mask} at (0,0) size 100x100
- RenderSVGEllipse {circle} at (0,0) size 100x100 [fill={[type=SOLID] [color=#000000]}] [cx=50.00] [cy=50.00] [r=50.00]
- [masker="mask1b"] RenderSVGResourceMasker {mask} at (0,0) size 100x100
- RenderSVGContainer {g} at (100,100) size 100x100
- [masker="mask3"] RenderSVGResourceMasker {mask} at (100,100) size 100x100
- RenderSVGEllipse {circle} at (100,100) size 100x100 [fill={[type=SOLID] [color=#000000]}] [cx=150.00] [cy=150.00] [r=50.00]
- [masker="mask2"] RenderSVGResourceMasker {mask} at (100,100) size 100x100
Deleted: trunk/LayoutTests/platform/qt/svg/clip-path/deep-nested-clip-in-mask-panning-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/svg/clip-path/deep-nested-clip-in-mask-panning-expected.txt (123522 => 123523)
--- trunk/LayoutTests/platform/qt/svg/clip-path/deep-nested-clip-in-mask-panning-expected.txt 2012-07-24 20:44:43 UTC (rev 123522)
+++ trunk/LayoutTests/platform/qt/svg/clip-path/deep-nested-clip-in-mask-panning-expected.txt 2012-07-24 20:46:31 UTC (rev 123523)
@@ -1,44 +0,0 @@
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (0,0) size 350x280
- RenderSVGHiddenContainer {defs} at (0,0) size 0x0
- RenderSVGResourceClipper {clipPath} [id="clip1"] [clipPathUnits=objectBoundingBox]
- RenderSVGEllipse {circle} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [cx=0.00] [cy=0.00] [r=0.50]
- RenderSVGEllipse {circle} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [cx=0.00] [cy=1.00] [r=0.50]
- RenderSVGResourceClipper {clipPath} [id="clip2"] [clipPathUnits=objectBoundingBox]
- RenderSVGEllipse {circle} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [cx=1.00] [cy=0.00] [r=0.50]
- RenderSVGEllipse {circle} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [cx=1.00] [cy=1.00] [r=0.50]
- RenderSVGResourceClipper {clipPath} [id="clip"] [clipPathUnits=objectBoundingBox]
- RenderSVGRect {rect} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- [clipPath="clip1"] RenderSVGResourceClipper {clipPath} at (-0.50,-0.50) size 1x2
- RenderSVGRect {rect} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- [clipPath="clip2"] RenderSVGResourceClipper {clipPath} at (0.50,-0.50) size 1x2
- RenderSVGResourceMasker {mask} [id="mask1a"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
- RenderSVGRect {rect} at (0,0) size 0x0 [fill={[type=SOLID] [color=#FFFFFF]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- RenderSVGRect {rect} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- [clipPath="clip1"] RenderSVGResourceClipper {clipPath} at (-0.50,-0.50) size 1x2
- RenderSVGResourceMasker {mask} [id="mask1b"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
- RenderSVGRect {rect} at (0,0) size 0x0 [fill={[type=SOLID] [color=#FFFFFF]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- RenderSVGRect {rect} at (0,0) size 0x0 [fill={[type=SOLID] [color=#000000]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- [clipPath="clip2"] RenderSVGResourceClipper {clipPath} at (0.50,-0.50) size 1x2
- RenderSVGResourceMasker {mask} [id="mask2"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
- RenderSVGRect {rect} at (0,0) size 0x0 [fill={[type=SOLID] [color=#FFFFFF]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- [masker="mask1a"] RenderSVGResourceMasker {mask} at (0,0) size 1x1
- RenderSVGResourceMasker {mask} [id="mask3"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
- RenderSVGRect {rect} at (0,0) size 0x0 [fill={[type=SOLID] [color=#FFFFFF]}] [x=0.00] [y=0.00] [width=1.00] [height=1.00]
- [masker="mask1b"] RenderSVGResourceMasker {mask} at (0,0) size 1x1
- RenderSVGContainer {g} at (0,0) size 25x100
- [masker="mask1a"] RenderSVGResourceMasker {mask} at (0,0) size 100x100
- RenderSVGEllipse {circle} at (0,0) size 25x100 [fill={[type=SOLID] [color=#000000]}] [cx=50.00] [cy=50.00] [r=50.00]
- [masker="mask1b"] RenderSVGResourceMasker {mask} at (0,0) size 100x100
- RenderSVGContainer {g} at (25,100) size 100x100
- [masker="mask3"] RenderSVGResourceMasker {mask} at (100,100) size 100x100
- RenderSVGEllipse {circle} at (25,100) size 100x100 [fill={[type=SOLID] [color=#000000]}] [cx=150.00] [cy=150.00] [r=50.00]
- [masker="mask2"] RenderSVGResourceMasker {mask} at (100,100) size 100x100
- RenderSVGText {text} at (75,234) size 350x46 contains 1 chunk(s)
- RenderSVGInlineText {#text} at (0,0) size 350x21
- chunk 1 (middle anchor) text run 1 at (75.00,250.00) startOffset 0 endOffset 52 width 350.00: "The left shape should still be visible after panning"
- RenderSVGTSpan {tspan} at (0,0) size 306x21
- RenderSVGInlineText {#text} at (22,25) size 305x21
- chunk 1 (middle anchor) text run 1 at (97.50,275.00) startOffset 0 endOffset 44 width 305.00: "And the right shape shouldn't look distorted"
Modified: trunk/LayoutTests/platform/qt-5.0/Skipped (123522 => 123523)
--- trunk/LayoutTests/platform/qt-5.0/Skipped 2012-07-24 20:44:43 UTC (rev 123522)
+++ trunk/LayoutTests/platform/qt-5.0/Skipped 2012-07-24 20:46:31 UTC (rev 123523)
@@ -120,6 +120,11 @@
# https://bugs.webkit.org/show_bug.cgi?id=92141
platform/qt/plugins/qt-qwidget-plugin.html
+# [Qt] svg/clip-path/deep-nested-clip-in-mask{,-panning}.svg failing
+# https://bugs.webkit.org/show_bug.cgi?id=92156
+svg/clip-path/deep-nested-clip-in-mask.svg
+svg/clip-path/deep-nested-clip-in-mask-panning.svg
+
# [Qt] The test fonts used for Qt tests changed to the Liberation font family,
# due to this we are skipping tons of tests. They will be unskipped in batches ASAP.
# https://bugs.webkit.org/show_bug.cgi?id=85203
@@ -947,15 +952,6 @@
svg/batik/text/textProperties.svg
svg/batik/text/textProperties2.svg
svg/batik/text/verticalTextOnPath.svg
-svg/clip-path/clip-path-pixelation.svg
-svg/clip-path/clip-path-text-and-shape.svg
-svg/clip-path/clip-path-text-and-stroke.svg
-svg/clip-path/clip-path-text.svg
-svg/clip-path/clip-path-tspan-and-stroke.svg
-svg/clip-path/clip-path-with-text-clipped.svg
-svg/clip-path/deep-nested-clip-in-mask-different-unitTypes.svg
-svg/clip-path/deep-nested-clip-in-mask-panning.svg
-svg/clip-path/deep-nested-clip-in-mask.svg
svg/css/composite-shadow-text.svg
svg/css/css-box-min-width.html
svg/css/text-shadow-multiple.xhtml