[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

krit at webkit.org krit at webkit.org
Wed Dec 22 14:31:12 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit aedc9bc0214576082af1b2f8ba82782621a2a62f
Author: krit at webkit.org <krit at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 08:39:00 2010 +0000

    2010-10-12  Dirk Schulze  <krit at webkit.org>
    
            Update of Leopard baseline after r69517.
            Rubber-stamped by Nikolas Zimmermann.
    
            * platform/mac-leopard/svg/batik/masking/maskRegions-expected.txt: Added.
            * platform/mac-leopard/svg/zoom/page/zoom-mask-with-percentages-expected.txt: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69566 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f68f2e1..a628898 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-12  Dirk Schulze  <krit at webkit.org>
+
+        Update of Leopard baseline after r69517.
+        Rubber-stamped by Nikolas Zimmermann.
+
+        * platform/mac-leopard/svg/batik/masking/maskRegions-expected.txt: Added.
+        * platform/mac-leopard/svg/zoom/page/zoom-mask-with-percentages-expected.txt: Added.
+
 2010-10-12  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed. Update Qt specific expected file after r69517.
diff --git a/LayoutTests/platform/mac-leopard/svg/batik/masking/maskRegions-expected.txt b/LayoutTests/platform/mac-leopard/svg/batik/masking/maskRegions-expected.txt
new file mode 100644
index 0000000..1c3d750
--- /dev/null
+++ b/LayoutTests/platform/mac-leopard/svg/batik/masking/maskRegions-expected.txt
@@ -0,0 +1,73 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 450x500
+  RenderSVGRoot {svg} at (90,36) size 265x368
+    RenderSVGContainer {g} at (90,36) size 265x368
+      RenderSVGText {text} at (174,36) size 102x17 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,0) size 102x17
+          chunk 1 (middle anchor) text run 1 at (174.00,50.00) startOffset 0 endOffset 12 width 102.00: "Mask Regions"
+      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+        RenderSVGResourceLinearGradient {linearGradient} [id="maskedGradient"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,1)]
+          RenderSVGGradientStop {stop} [offset=0.00] [color=#0000FF]
+          RenderSVGGradientStop {stop} [offset=1.00] [color=#FF0000]
+        RenderSVGPath {rect} at (0,0) size 100x80 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
+        RenderSVGResourceMasker {mask} [id="mask_1"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
+          RenderSVGPath {circle} at (5,0) size 40x40 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=25.00] [cy=20.00] [r=20.00]
+          RenderSVGPath {circle} at (5,40) size 40x40 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=25.00] [cy=60.00] [r=20.00]
+          RenderSVGPath {circle} at (55,0) size 40x40 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=75.00] [cy=20.00] [r=20.00]
+          RenderSVGPath {circle} at (55,40) size 40x40 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=75.00] [cy=60.00] [r=20.00]
+        RenderSVGResourceMasker {mask} [id="mask_2"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
+          RenderSVGPath {circle} at (5,0) size 40x40 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=25.00] [cy=20.00] [r=20.00]
+          RenderSVGPath {circle} at (5,40) size 40x40 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=25.00] [cy=60.00] [r=20.00]
+          RenderSVGPath {circle} at (55,0) size 40x40 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=75.00] [cy=20.00] [r=20.00]
+          RenderSVGPath {circle} at (55,40) size 40x40 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=75.00] [cy=60.00] [r=20.00]
+        RenderSVGResourceMasker {mask} [id="mask_3"] [maskUnits=userSpaceOnUse] [maskContentUnits=userSpaceOnUse]
+          RenderSVGPath {circle} at (5,0) size 40x40 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=25.00] [cy=20.00] [r=20.00]
+          RenderSVGPath {circle} at (5,40) size 40x40 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=25.00] [cy=60.00] [r=20.00]
+          RenderSVGPath {circle} at (55,0) size 40x40 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=75.00] [cy=20.00] [r=20.00]
+          RenderSVGPath {circle} at (55,40) size 40x40 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=75.00] [cy=60.00] [r=20.00]
+        RenderSVGResourceMasker {mask} [id="mask_4"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
+          RenderSVGPath {circle} at (0,0) size 1x1 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=0.25] [cy=0.20] [r=0.20]
+          RenderSVGPath {circle} at (0,0) size 1x1 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=0.25] [cy=0.60] [r=0.20]
+          RenderSVGPath {circle} at (0,0) size 1x1 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=0.75] [cy=0.20] [r=0.20]
+          RenderSVGPath {circle} at (0,0) size 1x1 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=0.75] [cy=0.60] [r=0.20]
+      RenderSVGContainer {g} at (175,83) size 100x97 [transform={m=((1.00,0.00)(0.00,1.00)) t=(175.00,100.00)}]
+        RenderSVGContainer {use} at (175,100) size 100x80
+          RenderSVGContainer {g} at (175,100) size 100x80
+            RenderSVGPath {rect} at (175,100) size 100x80 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
+        RenderSVGText {text} at (22,-17) size 56x17 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,0) size 56x17
+            chunk 1 (middle anchor) text run 1 at (22.00,-3.00) startOffset 0 endOffset 6 width 56.00: "Masked"
+      RenderSVGContainer {g} at (90,203) size 90x97 [transform={m=((1.00,0.00)(0.00,1.00)) t=(85.00,220.00)}]
+        RenderSVGContainer {use} at (90,220) size 90x80
+          [masker="mask_1"] RenderSVGResourceMasker {mask} at (5,0) size 90x80
+          RenderSVGContainer {g} at (85,220) size 100x80
+            RenderSVGPath {rect} at (85,220) size 100x80 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
+        RenderSVGText {text} at (24,-17) size 52x17 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,0) size 52x17
+            chunk 1 (middle anchor) text run 1 at (24.50,-3.00) startOffset 0 endOffset 6 width 51.00: "Mask 1"
+      RenderSVGContainer {g} at (109,323) size 52x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(85.00,340.00)}]
+        RenderSVGContainer {use} at (110,360) size 50x40
+          [masker="mask_2"] RenderSVGResourceMasker {mask} at (25,20) size 50x40
+          RenderSVGContainer {g} at (85,340) size 100x80
+            RenderSVGPath {rect} at (85,340) size 100x80 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
+        RenderSVGText {text} at (24,-17) size 52x17 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,0) size 52x17
+            chunk 1 (middle anchor) text run 1 at (24.50,-3.00) startOffset 0 endOffset 6 width 51.00: "Mask 2"
+      RenderSVGContainer {g} at (284,203) size 52x77 [transform={m=((1.00,0.00)(0.00,1.00)) t=(260.00,220.00)}]
+        RenderSVGContainer {use} at (285,240) size 50x40
+          [masker="mask_3"] RenderSVGResourceMasker {mask} at (25,20) size 50x40
+          RenderSVGContainer {g} at (260,220) size 100x80
+            RenderSVGPath {rect} at (260,220) size 100x80 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
+        RenderSVGText {text} at (24,-17) size 52x17 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,0) size 52x17
+            chunk 1 (middle anchor) text run 1 at (24.50,-3.00) startOffset 0 endOffset 6 width 51.00: "Mask 3"
+      RenderSVGContainer {g} at (264,323) size 91x81 [transform={m=((1.00,0.00)(0.00,1.00)) t=(260.00,340.00)}]
+        RenderSVGContainer {use} at (264,340) size 91x64
+          [masker="mask_4"] RenderSVGResourceMasker {mask} at (5.00,0) size 90x64
+          RenderSVGContainer {g} at (260,340) size 100x80
+            RenderSVGPath {rect} at (260,340) size 100x80 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
+        RenderSVGText {text} at (24,-17) size 52x17 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,0) size 52x17
+            chunk 1 (middle anchor) text run 1 at (24.50,-3.00) startOffset 0 endOffset 6 width 51.00: "Mask 4"
+    RenderSVGContainer {use} at (0,0) size 0x0
diff --git a/LayoutTests/platform/mac-leopard/svg/zoom/page/zoom-mask-with-percentages-expected.txt b/LayoutTests/platform/mac-leopard/svg/zoom/page/zoom-mask-with-percentages-expected.txt
new file mode 100644
index 0000000..b69158a
--- /dev/null
+++ b/LayoutTests/platform/mac-leopard/svg/zoom/page/zoom-mask-with-percentages-expected.txt
@@ -0,0 +1,73 @@
+layer at (0,0) size 933x1036
+  RenderView at (0,0) size 785x585
+layer at (0,0) size 933x1036
+  RenderSVGRoot {svg} at (186,74) size 550x764
+    RenderSVGContainer {g} at (186,74) size 550x764
+      RenderSVGText {text} at (179,36) size 92x18 contains 1 chunk(s)
+        RenderSVGInlineText {#text} at (0,0) size 92x18
+          chunk 1 (middle anchor) text run 1 at (179.50,50.00) startOffset 0 endOffset 12 width 91.00: "Mask Regions"
+      RenderSVGHiddenContainer {defs} at (0,0) size 0x0
+        RenderSVGResourceLinearGradient {linearGradient} [id="maskedGradient"] [gradientUnits=objectBoundingBox] [start=(0,0)] [end=(1,1)]
+          RenderSVGGradientStop {stop} [offset=0.00] [color=#0000FF]
+          RenderSVGGradientStop {stop} [offset=1.00] [color=#FF0000]
+        RenderSVGPath {rect} at (0,0) size 208x166 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
+        RenderSVGResourceMasker {mask} [id="mask_1"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
+          RenderSVGPath {circle} at (10,0) size 84x83 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=25.00] [cy=20.00] [r=20.00]
+          RenderSVGPath {circle} at (10,82) size 84x84 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=25.00] [cy=60.00] [r=20.00]
+          RenderSVGPath {circle} at (114,0) size 84x83 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=75.00] [cy=20.00] [r=20.00]
+          RenderSVGPath {circle} at (114,82) size 84x84 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=75.00] [cy=60.00] [r=20.00]
+        RenderSVGResourceMasker {mask} [id="mask_2"] [maskUnits=objectBoundingBox] [maskContentUnits=userSpaceOnUse]
+          RenderSVGPath {circle} at (10,0) size 84x83 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=25.00] [cy=20.00] [r=20.00]
+          RenderSVGPath {circle} at (10,82) size 84x84 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=25.00] [cy=60.00] [r=20.00]
+          RenderSVGPath {circle} at (114,0) size 84x83 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=75.00] [cy=20.00] [r=20.00]
+          RenderSVGPath {circle} at (114,82) size 84x84 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=75.00] [cy=60.00] [r=20.00]
+        RenderSVGResourceMasker {mask} [id="mask_3"] [maskUnits=userSpaceOnUse] [maskContentUnits=userSpaceOnUse]
+          RenderSVGPath {circle} at (10,0) size 84x83 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=25.00] [cy=20.00] [r=20.00]
+          RenderSVGPath {circle} at (10,82) size 84x84 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=25.00] [cy=60.00] [r=20.00]
+          RenderSVGPath {circle} at (114,0) size 84x83 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=75.00] [cy=20.00] [r=20.00]
+          RenderSVGPath {circle} at (114,82) size 84x84 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=75.00] [cy=60.00] [r=20.00]
+        RenderSVGResourceMasker {mask} [id="mask_4"] [maskUnits=objectBoundingBox] [maskContentUnits=objectBoundingBox]
+          RenderSVGPath {circle} at (0,0) size 3x3 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=0.25] [cy=0.20] [r=0.20]
+          RenderSVGPath {circle} at (0,0) size 3x3 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=0.25] [cy=0.60] [r=0.20]
+          RenderSVGPath {circle} at (0,0) size 3x3 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=0.75] [cy=0.20] [r=0.20]
+          RenderSVGPath {circle} at (0,0) size 3x3 [fill={[type=SOLID] [color=#FFFFFF]}] [cx=0.75] [cy=0.60] [r=0.20]
+      RenderSVGContainer {g} at (362,171) size 209x202 [transform={m=((1.00,0.00)(0.00,1.00)) t=(175.00,100.00)}]
+        RenderSVGContainer {use} at (362,207) size 209x166
+          RenderSVGContainer {g} at (362,207) size 209x166
+            RenderSVGPath {rect} at (362,207) size 209x166 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
+        RenderSVGText {text} at (25,-17) size 50x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,0) size 50x18
+            chunk 1 (middle anchor) text run 1 at (25.00,-3.00) startOffset 0 endOffset 6 width 50.00: "Masked"
+      RenderSVGContainer {g} at (186,420) size 188x202 [transform={m=((1.00,0.00)(0.00,1.00)) t=(85.00,220.00)}]
+        RenderSVGContainer {use} at (186,455) size 188x167
+          [masker="mask_1"] RenderSVGResourceMasker {mask} at (5,0) size 90x80
+          RenderSVGContainer {g} at (176,455) size 208x167
+            RenderSVGPath {rect} at (176,455) size 208x167 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
+        RenderSVGText {text} at (26,-17) size 48x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,0) size 48x18
+            chunk 1 (middle anchor) text run 1 at (26.50,-3.00) startOffset 0 endOffset 6 width 47.00: "Mask 1"
+      RenderSVGContainer {g} at (228,669) size 104x160 [transform={m=((1.00,0.00)(0.00,1.00)) t=(85.00,340.00)}]
+        RenderSVGContainer {use} at (228,745) size 104x84
+          [masker="mask_2"] RenderSVGResourceMasker {mask} at (25,20) size 50x40
+          RenderSVGContainer {g} at (176,704) size 208x167
+            RenderSVGPath {rect} at (176,704) size 208x167 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
+        RenderSVGText {text} at (26,-17) size 48x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,0) size 48x18
+            chunk 1 (middle anchor) text run 1 at (26.50,-3.00) startOffset 0 endOffset 6 width 47.00: "Mask 2"
+      RenderSVGContainer {g} at (590,420) size 105x161 [transform={m=((1.00,0.00)(0.00,1.00)) t=(260.00,220.00)}]
+        RenderSVGContainer {use} at (590,497) size 105x84
+          [masker="mask_3"] RenderSVGResourceMasker {mask} at (25,20) size 50x40
+          RenderSVGContainer {g} at (539,455) size 208x167
+            RenderSVGPath {rect} at (539,455) size 208x167 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
+        RenderSVGText {text} at (26,-17) size 48x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,0) size 48x18
+            chunk 1 (middle anchor) text run 1 at (26.50,-3.00) startOffset 0 endOffset 6 width 47.00: "Mask 3"
+      RenderSVGContainer {g} at (547,669) size 189x169 [transform={m=((1.00,0.00)(0.00,1.00)) t=(260.00,340.00)}]
+        RenderSVGContainer {use} at (547,704) size 189x134
+          [masker="mask_4"] RenderSVGResourceMasker {mask} at (5.00,0) size 90x64
+          RenderSVGContainer {g} at (539,704) size 208x167
+            RenderSVGPath {rect} at (539,704) size 208x167 [fill={[type=LINEAR-GRADIENT] [id="maskedGradient"]}] [x=0.00] [y=0.00] [width=100.00] [height=80.00]
+        RenderSVGText {text} at (26,-17) size 48x18 contains 1 chunk(s)
+          RenderSVGInlineText {#text} at (0,0) size 48x18
+            chunk 1 (middle anchor) text run 1 at (26.50,-3.00) startOffset 0 endOffset 6 width 47.00: "Mask 4"
+    RenderSVGHiddenContainer {defs} at (0,0) size 0x0

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list