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

[jschuh at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit fc23e5fd689bc41b4b721a5b94136c44aee61935
Author: jschuh at chromium.org <jschuh at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 22:00:28 2010 +0000

    2010-09-10  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by Darin Adler.
    
            SVGGElement::rendererIsNeeded should return false when parent isn't SVG
            https://bugs.webkit.org/show_bug.cgi?id=45562
    
            Test: svg/custom/g-outside-svg.html
    
            * svg/SVGGElement.cpp:
            (WebCore::SVGGElement::rendererIsNeeded):
            * svg/SVGGElement.h:
    2010-09-10  Justin Schuh  <jschuh at chromium.org>
    
            Reviewed by Darin Adler.
    
            SVGGElement::rendererIsNeeded should return false when parent isn't SVG
            https://bugs.webkit.org/show_bug.cgi?id=45562
    
            * svg/custom/g-outside-svg-expected.txt: Added.
            * svg/custom/g-outside-svg.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67236 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 08e4d98..90d5de1 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-10  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        SVGGElement::rendererIsNeeded should return false when parent isn't SVG
+        https://bugs.webkit.org/show_bug.cgi?id=45562
+
+        * svg/custom/g-outside-svg-expected.txt: Added.
+        * svg/custom/g-outside-svg.html: Added.
+
 2010-09-10  Jian Li  <jianli at chromium.org>
 
         Skip file api tests for workers that could crash occasionally before
diff --git a/LayoutTests/svg/custom/g-outside-svg-expected.txt b/LayoutTests/svg/custom/g-outside-svg-expected.txt
new file mode 100644
index 0000000..03938ca
--- /dev/null
+++ b/LayoutTests/svg/custom/g-outside-svg-expected.txt
@@ -0,0 +1,2 @@
+The SVG in the below frame should not render or crash.
+
diff --git a/LayoutTests/svg/custom/g-outside-svg.html b/LayoutTests/svg/custom/g-outside-svg.html
new file mode 100644
index 0000000..cc5da22
--- /dev/null
+++ b/LayoutTests/svg/custom/g-outside-svg.html
@@ -0,0 +1,12 @@
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+</script>
+The SVG in the below frame should not render or crash.</br>
+<iframe src='data:application/xhtml+xml,
+        &lt;svg:g xmlns:svg=&quot;http://www.w3.org/2000/svg&quot;&gt;
+            &lt;text&gt;
+                FAIL
+            &lt;/text&gt;
+        &lt;/svg:g&gt;'
+    ></iframe>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index faced09..c4c3af5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-09-10  Justin Schuh  <jschuh at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        SVGGElement::rendererIsNeeded should return false when parent isn't SVG
+        https://bugs.webkit.org/show_bug.cgi?id=45562
+
+        Test: svg/custom/g-outside-svg.html
+
+        * svg/SVGGElement.cpp:
+        (WebCore::SVGGElement::rendererIsNeeded):
+        * svg/SVGGElement.h:
+
 2010-09-10  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/svg/SVGGElement.cpp b/WebCore/svg/SVGGElement.cpp
index 8174eac..a455cd5 100644
--- a/WebCore/svg/SVGGElement.cpp
+++ b/WebCore/svg/SVGGElement.cpp
@@ -91,6 +91,11 @@ RenderObject* SVGGElement::createRenderer(RenderArena* arena, RenderStyle* style
     return new (arena) RenderSVGTransformableContainer(this);
 }
 
+bool SVGGElement::rendererIsNeeded(RenderStyle*)
+{
+    return parentNode() && parentNode()->isSVGElement(); 
+}
+
 }
 
 #endif // ENABLE(SVG)
diff --git a/WebCore/svg/SVGGElement.h b/WebCore/svg/SVGGElement.h
index a149351..b47eaba 100644
--- a/WebCore/svg/SVGGElement.h
+++ b/WebCore/svg/SVGGElement.h
@@ -50,7 +50,7 @@ namespace WebCore {
         virtual void svgAttributeChanged(const QualifiedName&);
         virtual void synchronizeProperty(const QualifiedName&);
 
-        virtual bool rendererIsNeeded(RenderStyle*) { return true; }
+        virtual bool rendererIsNeeded(RenderStyle*);
 
         // SVGExternalResourcesRequired
         DECLARE_ANIMATED_PROPERTY(SVGGElement, SVGNames::externalResourcesRequiredAttr, bool, ExternalResourcesRequired, externalResourcesRequired)

-- 
WebKit Debian packaging