2006-09-20 Eric Seidel <eric@eseidel.com>

        Reviewed by hyatt.

        Commit two test updates I forgot to commit with:
        Markers should clip to their viewport.
        http://bugzilla.opendarwin.org/show_bug.cgi?id=5967

        * svg/W3C-SVG-1.1/painting-marker-01-f-expected.checksum:
        * svg/W3C-SVG-1.1/painting-marker-01-f-expected.png:
        * svg/W3C-SVG-1.1/painting-marker-01-f-expected.txt:
        * svg/W3C-SVG-1.1/painting-marker-02-f-expected.checksum:
        * svg/W3C-SVG-1.1/painting-marker-02-f-expected.png:
        * svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 701eda26542c2ac7fd9da826384bd2280cda092d..b98770b43e4ee53fb63720c7751218ac8fe71f2a 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2006-09-20  Eric Seidel  <eric@eseidel.com>
+
+        Reviewed by hyatt.
+        
+        Commit two test updates I forgot to commit with:
+        Markers should clip to their viewport.
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=5967
+
+        * svg/W3C-SVG-1.1/painting-marker-01-f-expected.checksum:
+        * svg/W3C-SVG-1.1/painting-marker-01-f-expected.png:
+        * svg/W3C-SVG-1.1/painting-marker-01-f-expected.txt:
+        * svg/W3C-SVG-1.1/painting-marker-02-f-expected.checksum:
+        * svg/W3C-SVG-1.1/painting-marker-02-f-expected.png:
+        * svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt:
+
 2006-09-19  Eric Seidel  <eric@eseidel.com>
 
         Reviewed by adele.

diff --git a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.checksum
index 6790f95a7832f1a5d0760b8a674331dad36af588..8a06124df98bff6e35d9a9822f84b104c8e7952c 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.checksum
@@ -1 +1 @@
-c261a26d5328a329e5be942bfa6d256c
\ No newline at end of file
+019585273c0beee154b4afc95b48ea34
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png
index 442809124a53ab390e829a365c9f963f5b65f589..772026d51b23d79fb4653599aeb19501ac9ae07c 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.txt
index a9750bb8d645deb3a45050f5147082d70ba80ea9..34811b32afe66473f05d01a51b11a2051be325ee 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-01-f-expected.txt
@@ -7,16 +7,16 @@ layer at (0,0) size 480x360
   RenderView at (0,0) size 480x360
     KCanvasContainer {svg} at (0,0) size 479.50x359.50
       KCanvasContainer {g} at (0,0) size 311.31x288
-        KCanvasContainer {marker} at (0,0) size 10x10
-          KCanvasItem {rect} at (0,0) size 10x10 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
-        KCanvasContainer {marker} at (0,0) size 10x10
-          KCanvasItem {path} at (0,0) size 10x10 [fill={[type=SOLID] [color=#0000FF]}] [data="M5.00,0.00L10.00,10.00L0.00,10.00"]
-        KCanvasContainer {marker} at (0,0) size 10x10
-          KCanvasItem {rect} at (0,0) size 10x10 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
-        KCanvasContainer {marker} at (0,0) size 10x10
-          KCanvasItem {circle} at (0,0) size 10x10 [fill={[type=SOLID] [color=#008000]}] [data="M10.00,5.00L9.99,5.31L9.96,5.63L9.91,5.94L9.84,6.24L9.76,6.55L9.65,6.84L9.52,7.13L9.38,7.41L9.22,7.68L9.05,7.94L8.85,8.19L8.64,8.42L8.42,8.64L8.19,8.85L7.94,9.05L7.68,9.22L7.41,9.38L7.13,9.52L6.84,9.65L6.55,9.76L6.24,9.84L5.94,9.91L5.63,9.96L5.31,9.99L5.00,10.00L4.69,9.99L4.37,9.96L4.06,9.91L3.76,9.84L3.45,9.76L3.16,9.65L2.87,9.52L2.59,9.38L2.32,9.22L2.06,9.05L1.81,8.85L1.58,8.64L1.36,8.42L1.15,8.19L0.95,7.94L0.78,7.68L0.62,7.41L0.48,7.13L0.35,6.84L0.24,6.55L0.16,6.24L0.09,5.94L0.04,5.63L0.01,5.31L0.00,5.00L0.01,4.69L0.04,4.37L0.09,4.06L0.16,3.76L0.24,3.45L0.35,3.16L0.48,2.87L0.62,2.59L0.78,2.32L0.95,2.06L1.15,1.81L1.36,1.58L1.58,1.36L1.81,1.15L2.06,0.95L2.32,0.78L2.59,0.62L2.87,0.48L3.16,0.35L3.45,0.24L3.76,0.16L4.06,0.09L4.37,0.04L4.69,0.01L5.00,0.00L5.31,0.01L5.63,0.04L5.94,0.09L6.24,0.16L6.55,0.24L6.84,0.35L7.13,0.48L7.41,0.62L7.68,0.78L7.94,0.95L8.19,1.15L8.42,1.36L8.64,1.58L8.85,1.81L9.05,2.06L9.22,2.32L9.38,2.59L9.52,2.87L9.65,3.16L9.76,3.45L9.84,3.76L9.91,4.06L9.96,4.37L9.99,4.69"]
-        KCanvasContainer {marker} at (0,0) size 10x10
-          KCanvasItem {path} at (0,0) size 10x10 [fill={[type=SOLID] [color=#0000FF]}] [data="M5.00,0.00L10.00,10.00L0.00,10.00"]
+        KCanvasContainer {marker} at (0,0) size 2x2
+          KCanvasItem {rect} at (0,0) size 2x2 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+        KCanvasContainer {marker} at (0,0) size 2x2
+          KCanvasItem {path} at (0,0) size 2x2 [fill={[type=SOLID] [color=#0000FF]}] [data="M5.00,0.00L10.00,10.00L0.00,10.00"]
+        KCanvasContainer {marker} at (0,0) size 2x2
+          KCanvasItem {rect} at (0,0) size 2x2 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+        KCanvasContainer {marker} at (0,0) size 2x2
+          KCanvasItem {circle} at (0,0) size 2x2 [fill={[type=SOLID] [color=#008000]}] [data="M10.00,5.00L9.99,5.31L9.96,5.63L9.91,5.94L9.84,6.24L9.76,6.55L9.65,6.84L9.52,7.13L9.38,7.41L9.22,7.68L9.05,7.94L8.85,8.19L8.64,8.42L8.42,8.64L8.19,8.85L7.94,9.05L7.68,9.22L7.41,9.38L7.13,9.52L6.84,9.65L6.55,9.76L6.24,9.84L5.94,9.91L5.63,9.96L5.31,9.99L5.00,10.00L4.69,9.99L4.37,9.96L4.06,9.91L3.76,9.84L3.45,9.76L3.16,9.65L2.87,9.52L2.59,9.38L2.32,9.22L2.06,9.05L1.81,8.85L1.58,8.64L1.36,8.42L1.15,8.19L0.95,7.94L0.78,7.68L0.62,7.41L0.48,7.13L0.35,6.84L0.24,6.55L0.16,6.24L0.09,5.94L0.04,5.63L0.01,5.31L0.00,5.00L0.01,4.69L0.04,4.37L0.09,4.06L0.16,3.76L0.24,3.45L0.35,3.16L0.48,2.87L0.62,2.59L0.78,2.32L0.95,2.06L1.15,1.81L1.36,1.58L1.58,1.36L1.81,1.15L2.06,0.95L2.32,0.78L2.59,0.62L2.87,0.48L3.16,0.35L3.45,0.24L3.76,0.16L4.06,0.09L4.37,0.04L4.69,0.01L5.00,0.00L5.31,0.01L5.63,0.04L5.94,0.09L6.24,0.16L6.55,0.24L6.84,0.35L7.13,0.48L7.41,0.62L7.68,0.78L7.94,0.95L8.19,1.15L8.42,1.36L8.64,1.58L8.85,1.81L9.05,2.06L9.22,2.32L9.38,2.59L9.52,2.87L9.65,3.16L9.76,3.45L9.84,3.76L9.91,4.06L9.96,4.37L9.99,4.69"]
+        KCanvasContainer {marker} at (0,0) size 2x2
+          KCanvasItem {path} at (0,0) size 2x2 [fill={[type=SOLID] [color=#0000FF]}] [data="M5.00,0.00L10.00,10.00L0.00,10.00"]
         RenderSVGText {text} at (0,0) size 480x16
           RenderText {#text} at (0,0) size 90x16
             text run at (0,0) width 90: "Basic Markers"

diff --git a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.checksum
index 6615ba72eb76af780257d85961ee95cd0b73515e..3321b3114fbcc1240c28637a97a0b75908e7bdda 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.checksum
@@ -1 +1 @@
-095d15736a8a2dfe54789b5d8964dd19
\ No newline at end of file
+f90560719f7dd6a54697f9647eea3720
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png
index 59ff9662959b5dc7e31936ab63ff9a5d79e624c4..b719a482150980cefd9572e0ccc66c5c01e24a66 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
index 67a8a2447555d71a0ccec7e71598e7ebed3ab0fe..52e3ae6d278570dcecd984a5143a7f4d4b64747e 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
+++ b/LayoutTests/svg/W3C-SVG-1.1/painting-marker-02-f-expected.txt
@@ -13,8 +13,8 @@ layer at (0,0) size 480x360
           RenderText {#text} at (0,0) size 184x16
             text run at (0,0) width 184: "Marker Rendering Properties"
         KCanvasContainer {g} at (0,0) size 208x118
-          KCanvasContainer {marker} at (0,0) size 10x10
-            KCanvasItem {rect} at (0,0) size 10x10 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+          KCanvasContainer {marker} at (0,0) size 2x2
+            KCanvasItem {rect} at (0,0) size 2x2 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
           RenderSVGText {text} at (0,0) size 480x11
             RenderText {#text} at (0,0) size 54x11
               text run at (0,0) width 54: "Fill Property"
@@ -34,8 +34,8 @@ layer at (0,0) size 480x360
                 KCanvasContainer {g} at (192,102) size 16x16 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
                   KCanvasItem {rect} at (192,102) size 16x16 [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
         KCanvasContainer {g} at (-2,-2) size 451.60x121.60
-          KCanvasContainer {marker} at (-2,-2) size 24x24
-            KCanvasItem {rect} at (-2,-2) size 24x24 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
+          KCanvasContainer {marker} at (-0.40,-0.40) size 4.80x4.80
+            KCanvasItem {rect} at (-0.40,-0.40) size 4.80x4.80 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
           RenderSVGText {text} at (0,0) size 480x11
             RenderText {#text} at (0,0) size 72x11
               text run at (0,0) width 72: "Stroke Property"
@@ -55,10 +55,10 @@ layer at (0,0) size 480x360
                 KCanvasContainer {g} at (430.40,100.40) size 19.20x19.20 [transform={m=((0.20,0.00)(0.00,0.20)) t=(0.00,0.00)}]
                   KCanvasItem {rect} at (430.40,100.40) size 19.20x19.20 [stroke={[type=SOLID] [color=#000000] [stroke width=4.00]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
         KCanvasContainer {g} at (-4,-4) size 28x28
-          KCanvasContainer {marker} at (-4,-4) size 28x28
-            KCanvasItem {rect} at (-4,-4) size 28x28 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
-          KCanvasContainer {marker} at (-2,-2) size 14x14
-            KCanvasItem {rect} at (-2,-2) size 14x14 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
+          KCanvasContainer {marker} at (-0.80,-0.80) size 5.60x5.60
+            KCanvasItem {rect} at (-0.80,-0.80) size 5.60x5.60 [stroke={[type=SOLID] [color=#000000] [stroke width=8.00]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L20.00,0.00L20.00,20.00L0.00,20.00"]
+          KCanvasContainer {marker} at (-0.80,-0.80) size 5.60x5.60
+            KCanvasItem {rect} at (-0.80,-0.80) size 5.60x5.60 [stroke={[type=SOLID] [color=#0000FF] [stroke width=4.00]}] [fill={[type=SOLID] [color=#000000]}] [data="M0.00,0.00L10.00,0.00L10.00,10.00L0.00,10.00"]
         KCanvasContainer {g} at (25.17,178.80) size 186.03x72.40
           RenderSVGText {text} at (0,0) size 480x11
             RenderText {#text} at (0,0) size 77x11