Reviewed by Maciej.

        http://bugs.webkit.org/show_bug.cgi?id=9976
        Fix negative width issue in Hixie's test

        Refuse to render zero or negative width/height.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a906561463b2de7ed4d70ace55bc400ec40c56e8..a8b486506a368daf75c566da864232cad2e7da5b 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2007-06-26  Rob Buis  <buis@kde.org>
+
+        Reviewed by Maciej.
+
+        Testcase for:
+        http://bugs.webkit.org/show_bug.cgi?id=9976
+        Fix negative width issue in Hixie's test
+
+        * svg/hixie/error/013-broken-expected.checksum: Removed.
+        * svg/hixie/error/013-broken-expected.png: Removed.
+        * svg/hixie/error/013-broken-expected.txt: Removed.
+        * svg/hixie/error/013-broken.xml: Removed.
+        * svg/hixie/error/013-expected.checksum: Added.
+        * svg/hixie/error/013-expected.png: Added.
+        * svg/hixie/error/013-expected.txt: Added.
+
 2007-06-26  Rob Buis  <buis@kde.org>
 
         Reviewed by Maciej.

diff --git a/LayoutTests/svg/hixie/error/013-expected.checksum b/LayoutTests/svg/hixie/error/013-expected.checksum
new file mode 100644 (file)
index 0000000..862b264
--- /dev/null
+++ b/LayoutTests/svg/hixie/error/013-expected.checksum
@@ -0,0 +1 @@
+5d4145e5756207e345bc55e61e97c212
\ No newline at end of file

diff --git a/LayoutTests/svg/hixie/error/013-expected.png b/LayoutTests/svg/hixie/error/013-expected.png
new file mode 100644 (file)
index 0000000..20cb386
Binary files /dev/null and b/LayoutTests/svg/hixie/error/013-expected.png differ

diff --git a/LayoutTests/svg/hixie/error/013-expected.txt b/LayoutTests/svg/hixie/error/013-expected.txt
new file mode 100644 (file)
index 0000000..db1fc2c
--- /dev/null
+++ b/LayoutTests/svg/hixie/error/013-expected.txt
@@ -0,0 +1,18 @@
+CONSOLE MESSAGE: line 10: Error: A negative value for svg attribute <width> is not allowed
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x100
+  RenderBlock {html} at (0,0) size 800x100
+    RenderBody {body} at (8,8) size 784x76
+      RenderBlock (anonymous) at (0,0) size 784x24
+        RenderSVGContainer {svg} at (18,28) size 125x13
+          RenderSVGText {text} at (10,30) size 125x13 contains 1 chunk(s)
+            RenderSVGInlineText {#text} at (0,-10) size 125x13
+              chunk 1 text run 1 at (10.00,30.00) startOffset 0 endOffset 30 width 125.00: "FAIL (This should not render.)"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {p} at (0,40) size 784x36 [color=#008000]
+        RenderText {#text} at (0,0) size 749x36
+          text run at (0,0) width 417: "This line should be green, the word \"FAIL\" should not appear on "
+          text run at (417,0) width 332: "this page, but a highly perceivable indication of error"
+          text run at (0,18) width 65: "should be "
+          text run at (65,18) width 125: "present somewhere."

diff --git a/LayoutTests/svg/hixie/error/013-broken.xml b/LayoutTests/svg/hixie/error/013.xml
similarity index 100%
rename from LayoutTests/svg/hixie/error/013-broken.xml
rename to LayoutTests/svg/hixie/error/013.xml

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 993dae2f95c2cfd957496b14ce367095b8b03aaf..dc8f1486a3f67a8d92abf5892410809d4af77a52 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2007-06-26  Rob Buis  <buis@kde.org>
+
+        Reviewed by Maciej.
+
+        http://bugs.webkit.org/show_bug.cgi?id=9976
+        Fix negative width issue in Hixie's test
+
+        Refuse to render zero or negative width/height.
+
+        * rendering/RenderSVGContainer.cpp:
+        (WebCore::RenderSVGContainer::paint):
+        * rendering/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::paint):
+
 2007-06-26  Rob Buis  <buis@kde.org>
 
         Reviewed by Maciej.

diff --git a/WebCore/rendering/RenderSVGContainer.cpp b/WebCore/rendering/RenderSVGContainer.cpp
index be7c52136cde0e6eda3333a2894fdc5e575e74a9..c171c12c7823e3850efbbcbf2f411ad7ec70d538 100644 (file)
--- a/WebCore/rendering/RenderSVGContainer.cpp
+++ b/WebCore/rendering/RenderSVGContainer.cpp
@@ -152,6 +152,10 @@ void RenderSVGContainer::paint(PaintInfo& paintInfo, int parentX, int parentY)
     if (paintInfo.context->paintingDisabled() || !drawsContents())
         return;
 
+    // A value of zero disables rendering of the element. 
+    if (!viewport().isEmpty() && (viewport().width() <= 0. || viewport().height() <= 0.))
+        return;
+
     if (!firstChild()) {
 #if ENABLE(SVG_EXPERIMENTAL_FEATURES)
         // Spec: groups w/o children still may render filter content.

diff --git a/WebCore/rendering/RenderSVGRoot.cpp b/WebCore/rendering/RenderSVGRoot.cpp
index 4d197f714c48f59e0917a75553f4fae9209dae9f..a8f7b6df6c08bb5f81288a1baa0cdbfa16590f28 100644 (file)
--- a/WebCore/rendering/RenderSVGRoot.cpp
+++ b/WebCore/rendering/RenderSVGRoot.cpp
@@ -151,6 +151,10 @@ void RenderSVGRoot::paint(PaintInfo& paintInfo, int parentX, int parentY)
     if (paintInfo.context->paintingDisabled())
         return;
 
+    // A value of zero disables rendering of the element. 
+    if (viewport().width() <= 0. || viewport().height() <= 0.)
+        return;
+
     // This should only exist for <svg> renderers
     if (hasBoxDecorations() && (paintInfo.phase == PaintPhaseForeground || paintInfo.phase == PaintPhaseSelection)) 
         paintBoxDecorations(paintInfo, m_x + parentX, m_y + parentY);