[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

zoltan at webkit.org zoltan at webkit.org
Thu Oct 29 20:45:26 UTC 2009


The following commit has been merged in the webkit-1.1 branch:
commit 3bac804e64922fada5eee54f3bf3fade0eb147ae
Author: zoltan at webkit.org <zoltan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 17:26:10 2009 +0000

    2009-10-15  Andras Becsi  <becsi.andras at stud.u-szeged.hu>
    
            Reviewed by Adam Treat.
    
            [Qt] Add expected files for passing svg tests.
    
            * platform/qt/svg/custom/gradient-userSpaceOnUse-with-percentage-expected.txt: Added.
            * platform/qt/svg/custom/mask-with-default-value-expected.txt: Added.
            * platform/qt/svg/filters/feComposite-expected.txt: Added.
            * platform/qt/svg/filters/feGaussianBlur-expected.txt: Added.
            * platform/qt/svg/filters/feMerge-wrong-input-expected.txt: Added.
            * platform/qt/svg/filters/sourceAlpha-expected.txt: Added.
            * platform/qt/svg/filters/subRegion-in-userSpace-expected.txt: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49635 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ff25135..a2becd2 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2009-10-15  Andras Becsi  <becsi.andras at stud.u-szeged.hu>
+
+        Reviewed by Adam Treat.
+
+        [Qt] Add expected files for passing svg tests.
+
+        * platform/qt/svg/custom/gradient-userSpaceOnUse-with-percentage-expected.txt: Added.
+        * platform/qt/svg/custom/mask-with-default-value-expected.txt: Added.
+        * platform/qt/svg/filters/feComposite-expected.txt: Added.
+        * platform/qt/svg/filters/feGaussianBlur-expected.txt: Added.
+        * platform/qt/svg/filters/feMerge-wrong-input-expected.txt: Added.
+        * platform/qt/svg/filters/sourceAlpha-expected.txt: Added.
+        * platform/qt/svg/filters/subRegion-in-userSpace-expected.txt: Added.
+
 2009-10-15  Simon Fraser  <simon.fraser at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/LayoutTests/platform/qt/svg/custom/gradient-userSpaceOnUse-with-percentage-expected.txt b/LayoutTests/platform/qt/svg/custom/gradient-userSpaceOnUse-with-percentage-expected.txt
new file mode 100644
index 0000000..d940769
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/custom/gradient-userSpaceOnUse-with-percentage-expected.txt
@@ -0,0 +1,20 @@
+KRenderingPaintServer {id="gradient1" [type=LINEAR-GRADIENT] [stops=[(0.00,#FF0000), (1.00,#00FF00)]] [bounding box mode=0] [start=(0,0)] [end=(150,0)]}
+KRenderingPaintServer {id="gradient2" [type=LINEAR-GRADIENT] [stops=[(0.00,#FF0000), (1.00,#00FF00)]] [bounding box mode=0] [start=(0,0)] [end=(150,0)]}
+KRenderingPaintServer {id="gradient3" [type=RADIAL-GRADIENT] [stops=[(0.00,#00FF00), (1.00,#FF0000)]] [bounding box mode=0] [center=(150,264)] [focal=(150,264)] [radius=282.84]}
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 300x400
+  RenderSVGRoot {svg} at (0,0) size 300x400
+    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+      RenderSVGHiddenContainer {linearGradient} at (0,0) size 0x0
+        RenderSVGGradientStop {stop} at (0,0) size 0x0
+        RenderSVGGradientStop {stop} at (0,0) size 0x0
+      RenderSVGHiddenContainer {linearGradient} at (0,0) size 0x0
+        RenderSVGGradientStop {stop} at (0,0) size 0x0
+        RenderSVGGradientStop {stop} at (0,0) size 0x0
+      RenderSVGHiddenContainer {radialGradient} at (0,0) size 0x0
+        RenderSVGGradientStop {stop} at (0,0) size 0x0
+        RenderSVGGradientStop {stop} at (0,0) size 0x0
+    RenderPath {rect} at (0,0) size 300x50 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#FF0000), (1.00,#00FF00)]] [bounding box mode=0] [start=(0,0)] [end=(150,0)]}] [data="M 0 0L 300 0L 300 50L 0 50L 0 0"]
+    RenderPath {rect} at (0,50) size 300x50 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#FF0000), (1.00,#00FF00)]] [bounding box mode=0] [start=(0,0)] [end=(150,0)]}] [data="M 0 50L 300 50L 300 100L 0 100L 0 50"]
+    RenderPath {rect} at (0,100) size 300x300 [fill={[type=RADIAL-GRADIENT] [stops=[(0.00,#00FF00), (1.00,#FF0000)]] [bounding box mode=0] [center=(150,264)] [focal=(150,264)] [radius=282.84]}] [data="M 0 100L 300 100L 300 400L 0 400L 0 100"]
diff --git a/LayoutTests/platform/qt/svg/custom/mask-with-default-value-expected.txt b/LayoutTests/platform/qt/svg/custom/mask-with-default-value-expected.txt
new file mode 100644
index 0000000..e328d61
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/custom/mask-with-default-value-expected.txt
@@ -0,0 +1,10 @@
+KCanvasResource {id="m1" [type=MASKER]}
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderSVGRoot {svg} at (0,0) size 120x120
+    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+      RenderSVGContainer {mask} at (0,0) size 800x600
+        RenderPath {rect} at (0,0) size 800x600 [fill={[type=SOLID] [color=#000000]}] [data="M 0 0L 800 0L 800 600L 0 600L 0 0"]
+    RenderPath {rect} at (0,0) size 120x120 [fill={[type=SOLID] [color=#008000]}] [data="M 0 0L 120 0L 120 120L 0 120L 0 0"]
+    RenderPath {rect} at (10,10) size 100x100 [fill={[type=SOLID] [color=#FF0000]}] [data="M 10 10L 110 10L 110 110L 10 110L 10 10"]
diff --git a/LayoutTests/platform/qt/svg/filters/feComposite-expected.txt b/LayoutTests/platform/qt/svg/filters/feComposite-expected.txt
new file mode 100644
index 0000000..cecb091
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/filters/feComposite-expected.txt
@@ -0,0 +1,29 @@
+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
+    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+    RenderPath {rect} at (10,10) size 50x50 [fill={[type=SOLID] [color=#000000]}] [filter=over] [data="M 10 10L 60 10L 60 60L 10 60L 10 10"]
+    RenderSVGText {text} at (10,90) size 31x21 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-16) size 31x21
+        chunk 1 text run 1 at (10.00,90.00) startOffset 0 endOffset 4 width 31.00: "over"
+    RenderPath {rect} at (70,10) size 50x50 [fill={[type=SOLID] [color=#000000]}] [filter=in] [data="M 70 10L 120 10L 120 60L 70 60L 70 10"]
+    RenderSVGText {text} at (70,90) size 13x21 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-16) size 13x21
+        chunk 1 text run 1 at (70.00,90.00) startOffset 0 endOffset 2 width 13.00: "in"
+    RenderPath {rect} at (130,10) size 50x50 [fill={[type=SOLID] [color=#000000]}] [filter=out] [data="M 130 10L 180 10L 180 60L 130 60L 130 10"]
+    RenderSVGText {text} at (130,90) size 22x21 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-16) size 22x21
+        chunk 1 text run 1 at (130.00,90.00) startOffset 0 endOffset 3 width 22.00: "out"
+    RenderPath {rect} at (10,110) size 50x50 [fill={[type=SOLID] [color=#000000]}] [filter=atop] [data="M 10 110L 60 110L 60 160L 10 160L 10 110"]
+    RenderSVGText {text} at (10,190) size 31x21 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-16) size 31x21
+        chunk 1 text run 1 at (10.00,190.00) startOffset 0 endOffset 4 width 31.00: "atop"
+    RenderPath {rect} at (70,110) size 50x50 [fill={[type=SOLID] [color=#000000]}] [filter=xor] [data="M 70 110L 120 110L 120 160L 70 160L 70 110"]
+    RenderSVGText {text} at (70,190) size 22x21 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-16) size 22x21
+        chunk 1 text run 1 at (70.00,190.00) startOffset 0 endOffset 3 width 22.00: "xor"
+    RenderPath {rect} at (130,110) size 50x50 [fill={[type=SOLID] [color=#000000]}] [filter=arithmetic] [data="M 130 110L 180 110L 180 160L 130 160L 130 110"]
+    RenderSVGText {text} at (130,190) size 69x21 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,-16) size 69x21
+        chunk 1 text run 1 at (130.00,190.00) startOffset 0 endOffset 10 width 69.00: "arithmetic"
diff --git a/LayoutTests/platform/qt/svg/filters/feGaussianBlur-expected.txt b/LayoutTests/platform/qt/svg/filters/feGaussianBlur-expected.txt
new file mode 100644
index 0000000..0689d3b
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/filters/feGaussianBlur-expected.txt
@@ -0,0 +1,35 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderSVGRoot {svg} at (10,10) size 475x175
+    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+    RenderSVGContainer {g} at (10,10) size 75x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,10.00)}] [filter=0x0]
+      RenderPath {rect} at (10,10) size 50x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M 0 0L 50 0L 50 50L 0 50L 0 0"]
+      RenderPath {rect} at (35,35) size 50x50 [fill={[type=SOLID] [color=#0000FF]}] [data="M 25 25L 75 25L 75 75L 25 75L 25 25"]
+    RenderSVGContainer {g} at (110,10) size 75x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(110.00,10.00)}] [filter=0x5]
+      RenderPath {rect} at (110,10) size 50x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M 0 0L 50 0L 50 50L 0 50L 0 0"]
+      RenderPath {rect} at (135,35) size 50x50 [fill={[type=SOLID] [color=#0000FF]}] [data="M 25 25L 75 25L 75 75L 25 75L 25 25"]
+    RenderSVGContainer {g} at (210,10) size 75x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(210.00,10.00)}] [filter=5x0]
+      RenderPath {rect} at (210,10) size 50x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M 0 0L 50 0L 50 50L 0 50L 0 0"]
+      RenderPath {rect} at (235,35) size 50x50 [fill={[type=SOLID] [color=#0000FF]}] [data="M 25 25L 75 25L 75 75L 25 75L 25 25"]
+    RenderSVGContainer {g} at (310,10) size 75x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(310.00,10.00)}] [filter=3x3]
+      RenderPath {rect} at (310,10) size 50x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M 0 0L 50 0L 50 50L 0 50L 0 0"]
+      RenderPath {rect} at (335,35) size 50x50 [fill={[type=SOLID] [color=#0000FF]}] [data="M 25 25L 75 25L 75 75L 25 75L 25 25"]
+    RenderSVGContainer {g} at (410,10) size 75x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(410.00,10.00)}] [filter=1x6]
+      RenderPath {rect} at (410,10) size 50x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M 0 0L 50 0L 50 50L 0 50L 0 0"]
+      RenderPath {rect} at (435,35) size 50x50 [fill={[type=SOLID] [color=#0000FF]}] [data="M 25 25L 75 25L 75 75L 25 75L 25 25"]
+    RenderSVGContainer {g} at (10,110) size 75x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(10.00,110.00)}] [filter=6x1]
+      RenderPath {rect} at (10,110) size 50x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M 0 0L 50 0L 50 50L 0 50L 0 0"]
+      RenderPath {rect} at (35,135) size 50x50 [fill={[type=SOLID] [color=#0000FF]}] [data="M 25 25L 75 25L 75 75L 25 75L 25 25"]
+    RenderSVGContainer {g} at (110,110) size 75x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(110.00,110.00)}] [filter=2x10]
+      RenderPath {rect} at (110,110) size 50x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M 0 0L 50 0L 50 50L 0 50L 0 0"]
+      RenderPath {rect} at (135,135) size 50x50 [fill={[type=SOLID] [color=#0000FF]}] [data="M 25 25L 75 25L 75 75L 25 75L 25 25"]
+    RenderSVGContainer {g} at (210,110) size 75x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(210.00,110.00)}] [filter=1x1]
+      RenderPath {rect} at (210,110) size 50x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M 0 0L 50 0L 50 50L 0 50L 0 0"]
+      RenderPath {rect} at (235,135) size 50x50 [fill={[type=SOLID] [color=#0000FF]}] [data="M 25 25L 75 25L 75 75L 25 75L 25 25"]
+    RenderSVGContainer {g} at (310,110) size 75x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(310.00,110.00)}] [filter=10x100]
+      RenderPath {rect} at (310,110) size 50x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M 0 0L 50 0L 50 50L 0 50L 0 0"]
+      RenderPath {rect} at (335,135) size 50x50 [fill={[type=SOLID] [color=#0000FF]}] [data="M 25 25L 75 25L 75 75L 25 75L 25 25"]
+    RenderSVGContainer {g} at (410,110) size 75x75 [transform={m=((1.00,0.00)(0.00,1.00)) t=(410.00,110.00)}] [filter=15x15]
+      RenderPath {rect} at (410,110) size 50x50 [fill={[type=SOLID] [color=#FF0000]}] [data="M 0 0L 50 0L 50 50L 0 50L 0 0"]
+      RenderPath {rect} at (435,135) size 50x50 [fill={[type=SOLID] [color=#0000FF]}] [data="M 25 25L 75 25L 75 75L 25 75L 25 25"]
diff --git a/LayoutTests/platform/qt/svg/filters/feMerge-wrong-input-expected.txt b/LayoutTests/platform/qt/svg/filters/feMerge-wrong-input-expected.txt
new file mode 100644
index 0000000..3fb0f97
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/filters/feMerge-wrong-input-expected.txt
@@ -0,0 +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 100x100
+    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+    RenderSVGContainer {g} at (0,0) size 0x0 [filter=filter]
+    RenderPath {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M 0 0L 100 0L 100 100L 0 100L 0 0"]
diff --git a/LayoutTests/platform/qt/svg/filters/sourceAlpha-expected.txt b/LayoutTests/platform/qt/svg/filters/sourceAlpha-expected.txt
new file mode 100644
index 0000000..f70931e
--- /dev/null
+++ b/LayoutTests/platform/qt/svg/filters/sourceAlpha-expected.txt
@@ -0,0 +1,9 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderSVGRoot {svg} at (50,11) size 85x51
+    RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+    RenderSVGContainer {g} at (50,11) size 85x51 [filter=filter]
+      RenderSVGText {text} at (50,50) size 85x51 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,-39) size 85x51
+          chunk 1 text run 1 at (50.00,50.00) startOffset 0 endOffset 3 width 85.00: "SVG"
diff --git a/LayoutTests/platform/mac/svg/filters/subRegion-in-userSpace-expected.txt b/LayoutTests/platform/qt/svg/filters/subRegion-in-userSpace-expected.txt
similarity index 100%
copy from LayoutTests/platform/mac/svg/filters/subRegion-in-userSpace-expected.txt
copy to LayoutTests/platform/qt/svg/filters/subRegion-in-userSpace-expected.txt

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list