2006-01-26 Eric Seidel <eseidel@apple.com>

        Reviewed by mjs.

        SVG shows up blank in WebKit+SVG
        http://bugzilla.opendarwin.org/show_bug.cgi?id=6620

        * css/svg.css: default to width/height 100% for <svg>

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0f2208bbdbb92603b44e405293e045fec542bdf6..4d8e482df6a9d19e8438f8bb94a22723d54d727d 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2006-01-26  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by mjs.
+
+        * svg/custom/junk-data-expected.checksum:
+        * svg/custom/junk-data-expected.png:
+        * svg/custom/junk-data-expected.txt:
+        * svg/custom/missing-xlink-expected.checksum:
+        * svg/custom/missing-xlink-expected.png:
+        * svg/custom/missing-xlink-expected.txt:
+        * viewport-no-width-height.svg: Added.
+        * viewport-no-width-height-expected.checksum: Added.
+        * viewport-no-width-height-expected.png: Added.
+        * viewport-no-width-height-expected.txt: Added.
+
 2006-01-25  Alexander Kellett  <lypanov@kde.org>
 
         Reviewed by eseidel.

diff --git a/LayoutTests/svg/custom/junk-data-expected.checksum b/LayoutTests/svg/custom/junk-data-expected.checksum
index f63af8c33a86074bc9a4b24374809985cf97e726..6fa3c527ae5600f7f146d3d35747bb9410157eb2 100644 (file)
--- a/LayoutTests/svg/custom/junk-data-expected.checksum
+++ b/LayoutTests/svg/custom/junk-data-expected.checksum
@@ -1 +1 @@
-d2be29f5789bd64e3addbf9c88b0ba8a
\ No newline at end of file
+3eaee9f2c172cba5c66d3638fabde0b3
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/junk-data-expected.png b/LayoutTests/svg/custom/junk-data-expected.png
index 123db0c46b82e15aec11e363f371261421dff505..cbc37f2d45c88cf428521fd7ad889f6f69d07fa0 100644 (file)
Binary files a/LayoutTests/svg/custom/junk-data-expected.png and b/LayoutTests/svg/custom/junk-data-expected.png differ

diff --git a/LayoutTests/svg/custom/junk-data-expected.txt b/LayoutTests/svg/custom/junk-data-expected.txt
index f955aca9092fb95425eb0e4506fdd61f73e16358..d01e4c9995f6db2dbc7ce3ffec57a94072aaa4ca 100644 (file)
--- a/LayoutTests/svg/custom/junk-data-expected.txt
+++ b/LayoutTests/svg/custom/junk-data-expected.txt
@@ -1,21 +1,21 @@
-layer at (0,0) size 800x600
-  RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x156
-  RenderBlock {HTML} at (0,0) size 800x156
-    RenderBody {BODY} at (8,18) size 784x130
-      RenderBlock (anonymous) at (0,0) size 784x0
+layer at (0,0) size 785x730
+  RenderCanvas at (0,0) size 785x600
+layer at (0,0) size 785x156
+  RenderBlock {HTML} at (0,0) size 785x156
+    RenderBody {BODY} at (8,18) size 769x130
+      RenderBlock (anonymous) at (0,0) size 769x0
         RenderInline {PARSERERROR} at (0,0) size 0x0 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
-      RenderBlock (anonymous) at (0,0) size 784x94
-        RenderBlock {H3} at (0,0) size 784x22
+      RenderBlock (anonymous) at (0,0) size 769x94
+        RenderBlock {H3} at (0,0) size 769x22
           RenderText {TEXT} at (0,0) size 324x22
             text run at (0,0) width 324: "This page contains the following errors:"
-        RenderBlock {DIV} at (0,40) size 784x14
+        RenderBlock {DIV} at (0,40) size 769x14
           RenderText {TEXT} at (0,0) size 420x14
             text run at (0,0) width 420: "error on line 6 at column 48: StartTag: invalid element name"
-        RenderBlock {H3} at (0,72) size 784x22
+        RenderBlock {H3} at (0,72) size 769x22
           RenderText {TEXT} at (0,0) size 429x22
             text run at (0,0) width 429: "Below is a rendering of the page up to the first error."
-      RenderBlock (anonymous) at (0,112) size 784x18
+      RenderBlock (anonymous) at (0,112) size 769x18
         RenderInline {PARSERERROR} at (0,0) size 0x0 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
         KCanvasContainer {svg} at (8,130) size 100x100
           RenderSVGText {text} at (0,0) size 769x18

diff --git a/LayoutTests/svg/custom/missing-xlink-expected.checksum b/LayoutTests/svg/custom/missing-xlink-expected.checksum
index 5003d55c4e0b90ea57dfa9a908468d058ada460d..7b996237441d09f2600859c6cc9d9271c8a9ac69 100644 (file)
--- a/LayoutTests/svg/custom/missing-xlink-expected.checksum
+++ b/LayoutTests/svg/custom/missing-xlink-expected.checksum
@@ -1 +1 @@
-2fb4d21d31f34b391a6fbcac099fd3a1
\ No newline at end of file
+4f129c10741d25112276bec387acea2c
\ No newline at end of file

diff --git a/LayoutTests/svg/custom/missing-xlink-expected.png b/LayoutTests/svg/custom/missing-xlink-expected.png
index b429496df7b939303d2be43ffe672321792cfc2f..d560696e4338208b598e0f440dc65158d23c711f 100644 (file)
Binary files a/LayoutTests/svg/custom/missing-xlink-expected.png and b/LayoutTests/svg/custom/missing-xlink-expected.png differ

diff --git a/LayoutTests/svg/custom/missing-xlink-expected.txt b/LayoutTests/svg/custom/missing-xlink-expected.txt
index 3b392ab29f560808aebdf61d42480f63b21b8d1e..a7346b1da887a54f4645ef06667168158cf48111 100644 (file)
--- a/LayoutTests/svg/custom/missing-xlink-expected.txt
+++ b/LayoutTests/svg/custom/missing-xlink-expected.txt
@@ -1,21 +1,21 @@
-layer at (0,0) size 800x600
-  RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x156
-  RenderBlock {HTML} at (0,0) size 800x156
-    RenderBody {BODY} at (8,18) size 784x130
-      RenderBlock (anonymous) at (0,0) size 784x0
+layer at (0,0) size 785x730
+  RenderCanvas at (0,0) size 785x600
+layer at (0,0) size 785x156
+  RenderBlock {HTML} at (0,0) size 785x156
+    RenderBody {BODY} at (8,18) size 769x130
+      RenderBlock (anonymous) at (0,0) size 769x0
         RenderInline {PARSERERROR} at (0,0) size 0x0 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
-      RenderBlock (anonymous) at (0,0) size 784x94
-        RenderBlock {H3} at (0,0) size 784x22
+      RenderBlock (anonymous) at (0,0) size 769x94
+        RenderBlock {H3} at (0,0) size 769x22
           RenderText {TEXT} at (0,0) size 324x22
             text run at (0,0) width 324: "This page contains the following errors:"
-        RenderBlock {DIV} at (0,40) size 784x14
+        RenderBlock {DIV} at (0,40) size 769x14
           RenderText {TEXT} at (0,0) size 567x14
             text run at (0,0) width 567: "error on line 6 at column 60: Namespace prefix xlink for href on a is not defined"
-        RenderBlock {H3} at (0,72) size 784x22
+        RenderBlock {H3} at (0,72) size 769x22
           RenderText {TEXT} at (0,0) size 429x22
             text run at (0,0) width 429: "Below is a rendering of the page up to the first error."
-      RenderBlock (anonymous) at (0,112) size 784x18
+      RenderBlock (anonymous) at (0,112) size 769x18
         RenderInline {PARSERERROR} at (0,0) size 0x0 [bgcolor=#FFDDDD] [border: (2px solid #CC7777)]
         KCanvasContainer {svg} at (8,130) size 100x100
           RenderSVGText {text} at (0,0) size 769x18

diff --git a/LayoutTests/svg/custom/viewport-no-width-height-expected.checksum b/LayoutTests/svg/custom/viewport-no-width-height-expected.checksum
new file mode 100644 (file)
index 0000000..7363841
--- /dev/null
+++ b/LayoutTests/svg/custom/viewport-no-width-height-expected.checksum
@@ -0,0 +1 @@
+778803df0a824ed8f2c7dfa07c56832e
\ No newline at end of file

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

diff --git a/LayoutTests/svg/custom/viewport-no-width-height-expected.txt b/LayoutTests/svg/custom/viewport-no-width-height-expected.txt
new file mode 100644 (file)
index 0000000..a8a020e
--- /dev/null
+++ b/LayoutTests/svg/custom/viewport-no-width-height-expected.txt
@@ -0,0 +1,4 @@
+layer at (0,0) size 800x600
+  RenderCanvas at (0,0) size 800x600
+    KCanvasContainer {svg} at (0,0) size 100x100
+      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-no-width-height.svg b/LayoutTests/svg/custom/viewport-no-width-height.svg
new file mode 100644 (file)
index 0000000..0418ade
--- /dev/null
+++ b/LayoutTests/svg/custom/viewport-no-width-height.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 800 600" xmlns="http://www.w3.org/2000/svg">
+       <rect x="0" y="0" height="100" width="100" fill="green"/>
+</svg>

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e0ed57a5e9fe8f0d6507f879a898104125a46eb6..1d893473931240e96ad3e66fa9d86b09d4342639 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-26  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by mjs.
+
+        SVG shows up blank in WebKit+SVG
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=6620
+
+        * css/svg.css: default to width/height 100% for <svg>
+
 2006-01-26  Anders Carlsson  <andersca@mac.com>
 
         Reviewed by Darin.

diff --git a/WebCore/css/svg.css b/WebCore/css/svg.css
index 333f5f9a195af018420fabd686965b526c5d0461..fc0a6af32c66b1c76f3c24a012055fb439bbe439 100644 (file)
--- a/WebCore/css/svg.css
+++ b/WebCore/css/svg.css
@@ -37,6 +37,11 @@ svg:root {
     overflow: visible !important
 }
 
+svg {
+    width: 100%;
+    height: 100%;
+}
+
 svg, symbol, marker, pattern, foreignObject {
     overflow: hidden
 }