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

        Reviewed by mjs.

        Outermost <svg> element should clip to viewport
        http://bugzilla.opendarwin.org/show_bug.cgi?id=11007

        Test: svg/custom/viewport-clip.svg

        * css/svg.css: change svg:root overflow: from 'visible' to 'hidden'

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b974a7c8cb09cd6831a067b1a27b473ba567f4d8..9d42fe739cba45ce617b8b051e05ef3036e6cf5f 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,41 @@
+2006-09-24  Eric Seidel  <eric@eseidel.com>
+
+        Reviewed by mjs.
+        
+        Add test: svg/custom/viewport-clip.svg
+        and update results for:
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=11007
+        (Also update some old results, due to CoreImage variance)
+
+        * svg/custom/baseval-animval-equality.svg:
+        * svg/custom/empty-merge-expected.checksum:
+        * svg/custom/empty-merge-expected.png:
+        * svg/custom/empty-merge-expected.txt:
+        * svg/custom/empty-merge.svg:
+        * svg/custom/feDisplacementMap-01-expected.checksum:
+        * svg/custom/feDisplacementMap-01-expected.png:
+        * svg/custom/foreign-object-skew-expected.checksum:
+        * svg/custom/foreign-object-skew-expected.png:
+        * svg/custom/gradient-stroke-width-expected.txt:
+        * svg/custom/grayscale-gradient-mask-expected.checksum:
+        * svg/custom/grayscale-gradient-mask-expected.png:
+        * svg/custom/grayscale-gradient-mask-expected.txt:
+        * svg/custom/grayscale-gradient-mask.svg:
+        * svg/custom/image-with-transform-clip-filter-expected.checksum:
+        * svg/custom/image-with-transform-clip-filter-expected.png:
+        * svg/custom/path-bad-data-expected.checksum:
+        * svg/custom/path-bad-data-expected.png:
+        * svg/custom/path-bad-data-expected.txt:
+        * svg/custom/text-filter-expected.checksum:
+        * svg/custom/text-filter-expected.png:
+        * svg/custom/text-image-opacity-expected.checksum:
+        * svg/custom/text-image-opacity-expected.png:
+        * svg/custom/transform-scale-parse.svg:
+        * svg/custom/viewport-clip-expected.checksum: Added.
+        * svg/custom/viewport-clip-expected.png: Added.
+        * svg/custom/viewport-clip-expected.txt: Added.
+        * svg/custom/viewport-clip.svg: Added.
+
 2006-09-24  Eric Seidel  <eric@eseidel.com>
 
         Reviewed by beth.

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.checksum
index 698e12adce56c6eabb3903143c90623daae66769..a863b705465d505f4649ead061fd5a6a1e977b99 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.checksum
@@ -1 +1 @@
-38ce93d34c8b3bec6d5af29db8b012ca
\ No newline at end of file
+7847bf2cac88d386612c4edbf7647149
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png
index 186c599485bd32a6720828e33da32ab5fb8f092e..6d1a1dfd1fe8e9ecfc915f2200cfb3e96b25f277 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/filters-blend-01-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-color-01-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/filters-color-01-b-expected.checksum
index d3408d962c2ca0da6496a3b89a7ab8b62e9a441d..e4414136e1e9c39658d17ad96603317be3c8ad09 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-color-01-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-color-01-b-expected.checksum
@@ -1 +1 @@
-18bb0232784fc327349345715e225712
\ No newline at end of file
+56920e9811a0452b4abf17a9e6ceebf1
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-color-01-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/filters-color-01-b-expected.png
index 5f47cf9e1303e000765a03625705b0989a2a6a53..c99271f90b4c7198d73338fe79f198a485711bf6 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/filters-color-01-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/filters-color-01-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-composite-02-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/filters-composite-02-b-expected.checksum
index 231af7ca7667e9adaf602b4a391416cbe4fc6d9d..e499ff3f34754077e72b77fa9913efc0985b8e6c 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-composite-02-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-composite-02-b-expected.checksum
@@ -1 +1 @@
-e258c565778c5d676fe5cec0c11b2ee0
\ No newline at end of file
+83cfeb4c4928e79d480b5561f7428813
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-composite-02-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/filters-composite-02-b-expected.png
index 19efbed1598370fd6325a0cfb803b6c511fcab2b..b2264d3c2e54b06975895f03f069c9071245474f 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/filters-composite-02-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/filters-composite-02-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.checksum
index b788d8674de0827853c0d407f83ac3d7e0ecc532..5e6bae71ed24e05e160ec2438d2b79fa4b4eb101 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.checksum
@@ -1 +1 @@
-a45431d4850cfd56f901bca8af852429
\ No newline at end of file
+e30ae2cc19c549210797d09346a96d45
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.png
index 1e9cb4053e0f7fe8a0b22ee8eadb183f5f912d1b..7c0eea5fb15dbd1950ba89deaefeb2e70a142936 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/filters-comptran-01-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-displace-01-f-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/filters-displace-01-f-expected.checksum
index 63387106bca1d13b7b33dbacf5c4dceb1892e960..8cb851be490e34f8aae4cd7f9c5b60b45ac57dd8 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-displace-01-f-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-displace-01-f-expected.checksum
@@ -1 +1 @@
-6135572f19fd31f87baddc184313d89b
\ No newline at end of file
+4b5bce014d87f7ee731c593627cb0fb1
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png b/LayoutTests/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png
index 64da7baacfa7b341de92940e425d934cf88b2a19..557e5fa231b9b3b275fe0326d473264f1c1a11bb 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/filters-displace-01-f-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-example-01-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/filters-example-01-b-expected.checksum
index 310d8b3d64862fad06d62736e7f5080de169ecca..33419af4f44b84ead2cefd7bafcb431e7be26a2b 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-example-01-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-example-01-b-expected.checksum
@@ -1 +1 @@
-a2b347c38e9e789304f4f191ff6da3b6
\ No newline at end of file
+aaffa1aef88193713a911d5bffbcda47
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-example-01-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/filters-example-01-b-expected.png
index 0c7ca1ff72a0f14babbf23e61615a906e934f670..4f721372a0e04eb5efa573264852da94a8e0052d 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/filters-example-01-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/filters-example-01-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.checksum
index a7082e2446f5b336ebab62fc6eb85497dd4dfe46..730af19be04fdeaa99fbccd85871b21a63cfd16b 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.checksum
@@ -1 +1 @@
-73d605db9681b0da273934f8a1210e83
\ No newline at end of file
+7491546b0e44516d4f4670ba221dbaa5
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png
index 7bb2ca00e148394697d1fa6e6a3f0c7ead560a7d..a741ff0cc79d6eff8e56c2eb6de459f5b1cf5579 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/filters-gauss-01-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.checksum
index bf9b0ae0bd147e085fc6a7dc8601e31324089708..a249f85080efaefce6f086cdd09f43e7cd1dfc29 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.checksum
@@ -1 +1 @@
-8f97216e9a28955079733ee716bdb032
\ No newline at end of file
+23565dc1851811578a4b0b0fb4552b98
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.png b/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.png
index a12d2d7cf7457f33e9c93e5d122fc5effff3ec3d..cb998a8b0ac59c1a44890e215f60ede991897027 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/filters-light-01-f-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.checksum
index 78a497fe60d4433e99ecf17979bea0b68d1909eb..8fc20bec835682ef890275411845fbc825f21a46 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.checksum
@@ -1 +1 @@
-85fc21b21c47910cdf1b7a4958189b51
\ No newline at end of file
+e32796ddf5466e88f1add0dab18c9b1e
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.png
index ca9e980ba210a666ab7f6f7cf2897aa46a576f45..37daae67b810c91add0f2d73698e562527c99e20 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/interact-events-01-b-expected.png differ

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 a8fc04c8ef0a0242cada7bd452bcc42fc61b6b75..c2e1a51ca42d948256ed531d9c5d03369b24d987 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 @@
-ec702311470c62ec967603a109d90101
\ No newline at end of file
+b26779c28df76ad6bc0f28f0badd85f3
\ 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 c2f5d6ba1e6b6ba750d5dabe9da591115533ae74..62e214e6c1141efc0b0dd56b4aa7de3c9f70f5a5 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/struct-image-02-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/struct-image-02-b-expected.checksum
index df4623e16a2f3a30d1a313152d89d0f82ea05eb6..f3d19511c73b2a1d356dafcdccca7ce4e0f066a1 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/struct-image-02-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/struct-image-02-b-expected.checksum
@@ -1 +1 @@
-389a8b804eab2be3c66dcf321ee58457
\ No newline at end of file
+0c14a2775484871c233a6500c2c448a1
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/struct-image-02-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/struct-image-02-b-expected.png
index 16b6dbabe539c31b4c34a45110b3e783a102d3d2..92b3a25441c2e157abb10f42ccbbaf8a68320aaa 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/struct-image-02-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/struct-image-02-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/text-align-02-b-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/text-align-02-b-expected.checksum
index eea0c021cc33d3b171e6380ade74445a211ce0ad..882b023c6f3433339c7c9b0c3bf794d8d910fbdb 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/text-align-02-b-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/text-align-02-b-expected.checksum
@@ -1 +1 @@
-fb986799766726331446c798d0c835a4
\ No newline at end of file
+702fd3fa51fe7b7989459acdfdd2e2ea
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/text-align-02-b-expected.png b/LayoutTests/svg/W3C-SVG-1.1/text-align-02-b-expected.png
index c859e25d86e217b995392d68be3a3098ba6813ad..bc73bdf4bd51d33212deedab85ee656b1015b461 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/text-align-02-b-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/text-align-02-b-expected.png differ

diff --git a/LayoutTests/svg/W3C-SVG-1.1/text-fonts-01-t-expected.checksum b/LayoutTests/svg/W3C-SVG-1.1/text-fonts-01-t-expected.checksum
index d76abadfbe39cf28d1d9d4d54deaa2611540ac0f..a3e4cb32a4b0e74efd4f199f74a603f0435c20c0 100644 (file)
--- a/LayoutTests/svg/W3C-SVG-1.1/text-fonts-01-t-expected.checksum
+++ b/LayoutTests/svg/W3C-SVG-1.1/text-fonts-01-t-expected.checksum
@@ -1 +1 @@
-e36b9967afea9cf314ca1b52f8ffcc86
\ No newline at end of file
+be6fcbf38f50ceb52ca70868ff824af5
\ No newline at end of file

diff --git a/LayoutTests/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png b/LayoutTests/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png
index a0c8d9a05b35b836e6cf880f2dc8a24302f4fda8..d35a40b39635c80ecd2d30f6a7536691012af813 100644 (file)
Binary files a/LayoutTests/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png and b/LayoutTests/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png differ

diff --git a/LayoutTests/svg/custom/baseval-animval-equality.svg b/LayoutTests/svg/custom/baseval-animval-equality.svg
index 2c754abd584042f7435497eda44678bd58efded6..5a35e1b074946298c0c80f06f46d03f382c09bb1 100644 (file)
--- a/LayoutTests/svg/custom/baseval-animval-equality.svg
+++ b/LayoutTests/svg/custom/baseval-animval-equality.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" id="svg" width="400" height="400">
+<svg xmlns="http://www.w3.org/2000/svg" id="svg" width="600" height="400">
   <foreignObject>
     <html xmlns="http://www.w3.org/1999/xhtml">
       <div id="log">

diff --git a/LayoutTests/svg/custom/empty-merge-expected.checksum b/LayoutTests/svg/custom/empty-merge-expected.checksum
index feecaa24b79b96b1499060f32665d77b85b787fa..055ce4535f3c52a9a4db951a26d8e02cf7bfacc1 100644 (file)
--- a/LayoutTests/svg/custom/empty-merge-expected.checksum
+++ b/LayoutTests/svg/custom/empty-merge-expected.checksum
@@ -1 +1 @@
-d73791f973c72efa8e996b1630f872cb
\ No newline at end of file
+75dad2424ff5e9d3d4e2534fd38dd7c4
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/empty-merge-expected.png b/LayoutTests/svg/custom/empty-merge-expected.png
index b54364584043596f5bd4123cd724ec9e5c128c11..4fdb7e486d0b8466683d3a41e97e1631cc755d6e 100644 (file)
Binary files a/LayoutTests/svg/custom/empty-merge-expected.png and b/LayoutTests/svg/custom/empty-merge-expected.png differ

diff --git a/LayoutTests/svg/custom/empty-merge-expected.txt b/LayoutTests/svg/custom/empty-merge-expected.txt
index 1636bfae2d36f5e8d2f3b5a9db262481d4af2dfe..8caefd03c4a015a0f5edf7c4f346a1d0478c8670 100644 (file)
--- a/LayoutTests/svg/custom/empty-merge-expected.txt
+++ b/LayoutTests/svg/custom/empty-merge-expected.txt
@@ -1,8 +1,8 @@
-KCanvasResource {id="MyFilter" [type=FILTER]  [bounding box=at (0,0) size 100x100] [bounding box mode=0] [effects=[[type=MERGE]  [subregion="at (0,0) size 100x100"][merge inputs=[]]]]}
+KCanvasResource {id="MyFilter" [type=FILTER]  [bounding box=at (0,0) size 100x100] [bounding box mode=0] [effects=[[type=MERGE]  [subregion="at (0,0) size 800x600"][merge inputs=[]]]]}
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-    KCanvasContainer {svg} at (46.56,-0.94) size 191.76x191.76
-      KCanvasContainer {defs} at (47.50,0) size 0x0
-      KCanvasItem {rect} at (48.44,0.94) size 189.88x189.88 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#888888]}] [data="M1.00,1.00L101.00,1.00L101.00,101.00L1.00,101.00"]
-      KCanvasContainer {g} at (46.56,-0.94) size 189.88x189.88 [filter=#MyFilter]
-        KCanvasItem {rect} at (46.56,-0.94) size 189.88x189.88 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L100.00,0.00L100.00,100.00L0.00,100.00"]
+    KCanvasContainer {svg} at (-0.50,-0.50) size 102x102
+      KCanvasContainer {defs} at (0,0) size 0x0
+      KCanvasItem {rect} at (0.50,0.50) size 101x101 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#888888]}] [data="M1.00,1.00L101.00,1.00L101.00,101.00L1.00,101.00"]
+      KCanvasContainer {g} at (-0.50,-0.50) size 101x101 [filter=#MyFilter]
+        KCanvasItem {rect} at (-0.50,-0.50) size 101x101 [stroke={[type=SOLID] [color=#0000FF]}] [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L100.00,0.00L100.00,100.00L0.00,100.00"]

diff --git a/LayoutTests/svg/custom/empty-merge.svg b/LayoutTests/svg/custom/empty-merge.svg
index 80467f49c39eacbae16d36049ac9157b3d52355f..fc047310d0f7b0f66ab86b459069e348f277a068 100644 (file)
--- a/LayoutTests/svg/custom/empty-merge.svg
+++ b/LayoutTests/svg/custom/empty-merge.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
               "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="7.5cm" height="5cm" viewBox="0 0 100 100"
-     xmlns="http://www.w3.org/2000/svg" version="1.1">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1">
   <title>TestCase for empty feMerge component</title>
   <defs>
     <filter id="MyFilter" filterUnits="userSpaceOnUse" x="0" y="0" width="100" height="100">

diff --git a/LayoutTests/svg/custom/feDisplacementMap-01-expected.checksum b/LayoutTests/svg/custom/feDisplacementMap-01-expected.checksum
index a87a18c0d5c0654a9126d7aa53dcb5d4b27356fd..22f3b34394cda7d551ea04b21a8dd485b6f28e9d 100644 (file)
--- a/LayoutTests/svg/custom/feDisplacementMap-01-expected.checksum
+++ b/LayoutTests/svg/custom/feDisplacementMap-01-expected.checksum
@@ -1 +1 @@
-7105fd856be4c1be2936ef496d596fc3
\ No newline at end of file
+7a1eb24d16956546e2a063ca87ab9b23
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/feDisplacementMap-01-expected.png b/LayoutTests/svg/custom/feDisplacementMap-01-expected.png
index f3c5a10e921a79ff39772a5f348ef07acd359146..95bd0a17f1955b737599508515b55bcc665a8732 100644 (file)
Binary files a/LayoutTests/svg/custom/feDisplacementMap-01-expected.png and b/LayoutTests/svg/custom/feDisplacementMap-01-expected.png differ

diff --git a/LayoutTests/svg/custom/foreign-object-skew-expected.checksum b/LayoutTests/svg/custom/foreign-object-skew-expected.checksum
index 28709b6bc3c841a47f2e2a9606b906a74926e6c2..51ea488c4500b8c967df1b0831fa3f4ec188e9a6 100644 (file)
--- a/LayoutTests/svg/custom/foreign-object-skew-expected.checksum
+++ b/LayoutTests/svg/custom/foreign-object-skew-expected.checksum
@@ -1 +1 @@
-36daf463c6f4ea30331a7609a870231a
\ No newline at end of file
+7d9ef189266928141f792c18c6f406a4
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/foreign-object-skew-expected.png b/LayoutTests/svg/custom/foreign-object-skew-expected.png
index cb7648c498764e26eabec612875c5d381d2614f4..18153437979d5f78b2eeeab7c9fd0dee739e6207 100644 (file)
Binary files a/LayoutTests/svg/custom/foreign-object-skew-expected.png and b/LayoutTests/svg/custom/foreign-object-skew-expected.png differ

diff --git a/LayoutTests/svg/custom/gradient-stroke-width-expected.txt b/LayoutTests/svg/custom/gradient-stroke-width-expected.txt
index e911cf6683d29d62950a6adc4517512914753643..8b15ee3c63a4c51b3af869661ea425471807ead1 100644 (file)
--- a/LayoutTests/svg/custom/gradient-stroke-width-expected.txt
+++ b/LayoutTests/svg/custom/gradient-stroke-width-expected.txt
@@ -1,3 +1,4 @@
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:(null) affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
 KRenderingPaintServer {id="black2white" [type=LINEAR-GRADIENT] [stops=[(0.00,#000000), (1.00,#0000004C)]] [start=(0,0)] [end=(100,0)]}
 KRenderingPaintServer {id="red-grad" [type=LINEAR-GRADIENT] [stops=[(0.00,#D7433C), (1.00,#BD1F1844)]] [start=(0,0)] [end=(100,0)]}
 KRenderingPaintServer {id="red-radial-grad" [type=RADIAL-GRADIENT] [stops=[(0.00,#D7433C), (1.00,#BD1F1844)]] [center=(50,50)] [focal=(50,50)] [radius=50.00]}

diff --git a/LayoutTests/svg/custom/grayscale-gradient-mask-expected.checksum b/LayoutTests/svg/custom/grayscale-gradient-mask-expected.checksum
index 74b18a8ac3d112eda483392cd6a31c9b5c00b938..41bd6eeb65ddbedab1e9f6cca550e696699829b9 100644 (file)
--- a/LayoutTests/svg/custom/grayscale-gradient-mask-expected.checksum
+++ b/LayoutTests/svg/custom/grayscale-gradient-mask-expected.checksum
@@ -1 +1 @@
-61c7b4b2a6201be323d0464e593823db
\ No newline at end of file
+84239fbfc245574f6492dc4743e43a40
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/grayscale-gradient-mask-expected.png b/LayoutTests/svg/custom/grayscale-gradient-mask-expected.png
index 1514950d709466cd0b19577a43662162b109b008..c51ea0f91d15315bce2ee3aa395b5392e55d099b 100644 (file)
Binary files a/LayoutTests/svg/custom/grayscale-gradient-mask-expected.png and b/LayoutTests/svg/custom/grayscale-gradient-mask-expected.png differ

diff --git a/LayoutTests/svg/custom/grayscale-gradient-mask-expected.txt b/LayoutTests/svg/custom/grayscale-gradient-mask-expected.txt
index 809a4f8d548273a7a794fdd1210d23a3447e1507..ec3f9edeb4105deeac6782631baf56b2d4511ecd 100644 (file)
--- a/LayoutTests/svg/custom/grayscale-gradient-mask-expected.txt
+++ b/LayoutTests/svg/custom/grayscale-gradient-mask-expected.txt
@@ -2,9 +2,9 @@ KRenderingPaintServer {id="Gradient" [type=LINEAR-GRADIENT] [stops=[(0.00,#FFFFF
 KCanvasResource {id="Mask" [type=MASKER]}
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-    KCanvasContainer {svg} at (0.33,0) size 301.33x113
-      KCanvasContainer {defs} at (0.33,0) size 0x0
-      KCanvasContainer {mask} at (0.33,0) size 301.33x113
-        KCanvasItem {rect} at (0.33,0) size 301.33x113 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#FFFFFF), (1.00,#000000)]] [bounding box mode=0] [start=(0,0)] [end=(800,0)]}] [data="M0.00,0.00L800.00,0.00L800.00,300.00L0.00,300.00"]
-      KCanvasItem {rect} at (0.33,0) size 301.33x113 [fill={[type=SOLID] [color=#FF8080]}] [data="M0.00,0.00L800.00,0.00L800.00,300.00L0.00,300.00"]
-      KCanvasItem {rect} at (0.33,37.67) size 301.33x37.67 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,100.00L800.00,100.00L800.00,200.00L0.00,200.00"]
+    KCanvasContainer {svg} at (0,143.90) size 780.49x292.68
+      KCanvasContainer {defs} at (0,143.90) size 0x0
+      KCanvasContainer {mask} at (0,143.90) size 780.49x292.68
+        KCanvasItem {rect} at (0,143.90) size 780.49x292.68 [fill={[type=LINEAR-GRADIENT] [stops=[(0.00,#FFFFFF), (1.00,#000000)]] [bounding box mode=0] [start=(0,0)] [end=(800,0)]}] [data="M0.00,0.00L800.00,0.00L800.00,300.00L0.00,300.00"]
+      KCanvasItem {rect} at (0,143.90) size 780.49x292.68 [fill={[type=SOLID] [color=#FF8080]}] [data="M0.00,0.00L800.00,0.00L800.00,300.00L0.00,300.00"]
+      KCanvasItem {rect} at (0,241.46) size 780.49x97.56 [fill={[type=SOLID] [color=#0000FF]}] [data="M0.00,100.00L800.00,100.00L800.00,200.00L0.00,200.00"]

diff --git a/LayoutTests/svg/custom/grayscale-gradient-mask.svg b/LayoutTests/svg/custom/grayscale-gradient-mask.svg
index b8dcd924331c7397d62d8586d03c47d1cf7d7d41..d5fbdcc9de086100e1cb8c4de4c107c87aaa731a 100644 (file)
--- a/LayoutTests/svg/custom/grayscale-gradient-mask.svg
+++ b/LayoutTests/svg/custom/grayscale-gradient-mask.svg
@@ -1,8 +1,7 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="8cm" height="3cm" viewBox="0 0 800 300" version="1.1"
-     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg viewBox="0 0 820 320" version="1.1" xmlns="http://www.w3.org/2000/svg">
   <desc>Example mask01 - blue text masked with gradient against red background
   </desc>
   <defs>

diff --git a/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.checksum b/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.checksum
index d3f9673b2856626b23ea14dec8924cce5705fac5..77359cddc9b047b7a1890cb91b574af7adb0b294 100644 (file)
--- a/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.checksum
+++ b/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.checksum
@@ -1 +1 @@
-24f4ba5a9a930beca8c1d1ea49356005
\ No newline at end of file
+00bc36aedfe75c788cf5d54dce444148
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.png b/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.png
index e6f3afd53af6f11190473c67b5989e4236995bc6..9c802a2788e40d31c5dd636b79c1bf4ec44f7acc 100644 (file)
Binary files a/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.png and b/LayoutTests/svg/custom/image-with-transform-clip-filter-expected.png differ

diff --git a/LayoutTests/svg/custom/path-bad-data-expected.checksum b/LayoutTests/svg/custom/path-bad-data-expected.checksum
index 6ffe09a5cf8b68f75bcf20a0d3a35e840ed8ff47..70ff6b2d9584309287b6ae43580efe3174cf614c 100644 (file)
--- a/LayoutTests/svg/custom/path-bad-data-expected.checksum
+++ b/LayoutTests/svg/custom/path-bad-data-expected.checksum
@@ -1 +1 @@
-b6275b6bf7e979d90ca327219c35a41d
\ No newline at end of file
+094d16f58ae86cd9085a07f399074697
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/path-bad-data-expected.png b/LayoutTests/svg/custom/path-bad-data-expected.png
index 830e41cdf23d46878124b145d91c5e94b5345cca..ee5d7365d9d0d109a92f533017e4665565b8345b 100644 (file)
Binary files a/LayoutTests/svg/custom/path-bad-data-expected.png and b/LayoutTests/svg/custom/path-bad-data-expected.png differ

diff --git a/LayoutTests/svg/custom/path-bad-data-expected.txt b/LayoutTests/svg/custom/path-bad-data-expected.txt
index 01167405dc0c97be39a8360eef4f0694c60fa69d..2a4f3f35105becdcdfdaef72f8d14297c6c31c54 100644 (file)
--- a/LayoutTests/svg/custom/path-bad-data-expected.txt
+++ b/LayoutTests/svg/custom/path-bad-data-expected.txt
@@ -1,4 +1,4 @@
-layer at (0,0) size 785x755
-  RenderView at (0,0) size 785x600
+layer at (0,0) size 800x755
+  RenderView at (0,0) size 800x600
     KCanvasContainer {svg} at (0,-233.40) size 677.31x494.82
       KCanvasItem {path} at (0,-233.40) size 677.31x494.82 [fill={[type=SOLID] [color=#000000]}] [data="M602.78,261.43C677.31,100.20,602.79,-89.02,436.34,-161.21C269.89,-233.40,74.53,-161.22,0.00,-0.00"]

diff --git a/LayoutTests/svg/custom/text-filter-expected.checksum b/LayoutTests/svg/custom/text-filter-expected.checksum
index b3cd71d1b08d7780ab18c78ffcb0ff1e1663ac72..ab3f181f38ba9c0fb872a781a2ae2586fcd680e0 100644 (file)
--- a/LayoutTests/svg/custom/text-filter-expected.checksum
+++ b/LayoutTests/svg/custom/text-filter-expected.checksum
@@ -1 +1 @@
-ca758134f971941a127e522830bc6856
\ No newline at end of file
+4e78b875afa90dff3d0d06f21abe5002
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/text-filter-expected.png b/LayoutTests/svg/custom/text-filter-expected.png
index 3581d5f76752829ffb1e70854934b3341499f2c6..d58989dcd57a3bf5f0e50f071ca25b1d2e7fefb4 100644 (file)
Binary files a/LayoutTests/svg/custom/text-filter-expected.png and b/LayoutTests/svg/custom/text-filter-expected.png differ

diff --git a/LayoutTests/svg/custom/text-image-opacity-expected.checksum b/LayoutTests/svg/custom/text-image-opacity-expected.checksum
index 2197546dbbbfe2609633e0830b03180f751e1ec4..69a3fcbdbf0ce77894d19b8df190f560eb7c3cc2 100644 (file)
--- a/LayoutTests/svg/custom/text-image-opacity-expected.checksum
+++ b/LayoutTests/svg/custom/text-image-opacity-expected.checksum
@@ -1 +1 @@
-16b14a694efdd66b070c6e52415f0f0c
\ No newline at end of file
+dd6e0900f76d7d5816ee28043c5c02f0
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/text-image-opacity-expected.png b/LayoutTests/svg/custom/text-image-opacity-expected.png
index 4b9a0b812d584b764dc4df88d97bfc490d9686eb..96c7b61838507fcd359f1b1deb1ca264f6bdd805 100644 (file)
Binary files a/LayoutTests/svg/custom/text-image-opacity-expected.png and b/LayoutTests/svg/custom/text-image-opacity-expected.png differ

diff --git a/LayoutTests/svg/custom/transform-scale-parse.svg b/LayoutTests/svg/custom/transform-scale-parse.svg
index 0a190482bce69b2534e0209a073c2fcbfac045ae..1db4f380cca809d60df45469b761605ae8d5d1f2 100644 (file)
--- a/LayoutTests/svg/custom/transform-scale-parse.svg
+++ b/LayoutTests/svg/custom/transform-scale-parse.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100">
+<svg xmlns="http://www.w3.org/2000/svg">
   <rect x="10" y="10" width="100" height="100" fill="red" />
   <rect x="0" y="0" width="50" height="50" fill="green" transform="translate(10,10), scale(2)" />
 </svg>

diff --git a/LayoutTests/svg/custom/viewport-clip-expected.checksum b/LayoutTests/svg/custom/viewport-clip-expected.checksum
new file mode 100644 (file)
index 0000000..3a4f1f7
--- /dev/null
+++ b/LayoutTests/svg/custom/viewport-clip-expected.checksum
@@ -0,0 +1 @@
+16310588467cfc20d551635abc59b784
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/viewport-clip-expected.png b/LayoutTests/svg/custom/viewport-clip-expected.png
new file mode 100644 (file)
index 0000000..3db2634
Binary files /dev/null and b/LayoutTests/svg/custom/viewport-clip-expected.png differ

diff --git a/LayoutTests/svg/custom/viewport-clip-expected.txt b/LayoutTests/svg/custom/viewport-clip-expected.txt
new file mode 100644 (file)
index 0000000..3872cba
--- /dev/null
+++ b/LayoutTests/svg/custom/viewport-clip-expected.txt
@@ -0,0 +1,5 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+    KCanvasContainer {svg} at (0,0) size 200x200
+      KCanvasItem {rect} at (0,0) size 200x200 [fill={[type=SOLID] [color=#FF0000]}] [data="M0.00,0.00L200.00,0.00L200.00,200.00L0.00,200.00"]
+      KCanvasItem {rect} at (0,0) size 100x100 [fill={[type=SOLID] [color=#008000]}] [data="M0.00,0.00L100.00,0.00L100.00,100.00L0.00,100.00"]

diff --git a/LayoutTests/svg/custom/viewport-clip.svg b/LayoutTests/svg/custom/viewport-clip.svg
new file mode 100644 (file)
index 0000000..66d245c
--- /dev/null
+++ b/LayoutTests/svg/custom/viewport-clip.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="100px" height="100px">
+  <rect width="200" height="200" fill="red" />
+  <rect width="100" height="100" fill="green" />
+</svg>

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4528cbd33f11b5d03115c3a233e0c18e3ac5c12a..3af8c4cbca15db82483966f12b1f1aff65c0f4d2 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2006-09-25  Eric Seidel  <eric@eseidel.com>
+
+        Reviewed by mjs.
+        
+        Outermost <svg> element should clip to viewport
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=11007
+
+        Test: svg/custom/viewport-clip.svg
+
+        * css/svg.css: change svg:root overflow: from 'visible' to 'hidden'
+
 2006-09-25  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Maciej.

diff --git a/WebCore/css/svg.css b/WebCore/css/svg.css
index 8ef43312519f0fd37151c1c41af94e079cf68cb5..0784b9520517658623e3f0d1673361ca2ce3f81f 100644 (file)
--- a/WebCore/css/svg.css
+++ b/WebCore/css/svg.css
@@ -34,7 +34,7 @@
     to the bounds of the initial viewport.
 */
 svg:root {
-    overflow: visible !important
+    overflow: hidden !important
 }
 
 svg {