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

Wed Dec 22 16:11:44 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit f5cbd70c0cb9a916c1d3e3944453f23f8e69bdda
Author: zimmermann at webkit.org <zimmermann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 19 15:44:35 2010 +0000

    2010-11-19  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            SVGTransformList::consolidate() fails on empty lists
            https://bugs.webkit.org/show_bug.cgi?id=49619
    
            Return null in consolidate() when the list is empty, according to SVG 1.1.
    
            Test: svg/dom/SVGTransformList-empty-list-consolidation.html
    
            * svg/properties/SVGTransformListPropertyTearOff.h:
            (WebCore::SVGTransformListPropertyTearOff::consolidate):
    
    2010-11-19  Nikolas Zimmermann  <nzimmermann at rim.com>
    
            Reviewed by Dirk Schulze.
    
            SVGTransformList::consolidate() fails on empty lists
            https://bugs.webkit.org/show_bug.cgi?id=49619
    
            * svg/dom/SVGTransformList-empty-list-consolidation-expected.txt: Added.
            * svg/dom/SVGTransformList-empty-list-consolidation.html: Added.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72400 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 61c39a4..ed500c9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-19  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        SVGTransformList::consolidate() fails on empty lists
+        https://bugs.webkit.org/show_bug.cgi?id=49619
+
+        * svg/dom/SVGTransformList-empty-list-consolidation-expected.txt: Added.
+        * svg/dom/SVGTransformList-empty-list-consolidation.html: Added.
+
 2010-11-19  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed.
diff --git a/LayoutTests/svg/dom/SVGTransformList-empty-list-consolidation-expected.txt b/LayoutTests/svg/dom/SVGTransformList-empty-list-consolidation-expected.txt
new file mode 100644
index 0000000..68a0c3d
--- /dev/null
+++ b/LayoutTests/svg/dom/SVGTransformList-empty-list-consolidation-expected.txt
@@ -0,0 +1 @@
+This test passes if it doesn't fire an assertion.
diff --git a/LayoutTests/svg/dom/SVGTransformList-empty-list-consolidation.html b/LayoutTests/svg/dom/SVGTransformList-empty-list-consolidation.html
new file mode 100644
index 0000000..e05c0a5
--- /dev/null
+++ b/LayoutTests/svg/dom/SVGTransformList-empty-list-consolidation.html
@@ -0,0 +1,17 @@
+<html>
+<head>
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+function go() {
+    var oSvgPatternElement = document.createElementNS("http://www.w3.org/2000/svg","pattern");
+    var oSvgTransformList = oSvgPatternElement.patternTransform.baseVal;
+    oSvgTransformList.consolidate();
+}
+</script>
+</head>
+<body onload="go()">
+This test passes if it doesn't fire an assertion.
+</body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fd87476..7274f43 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-11-19  Nikolas Zimmermann  <nzimmermann at rim.com>
+
+        Reviewed by Dirk Schulze.
+
+        SVGTransformList::consolidate() fails on empty lists
+        https://bugs.webkit.org/show_bug.cgi?id=49619
+
+        Return null in consolidate() when the list is empty, according to SVG 1.1.
+
+        Test: svg/dom/SVGTransformList-empty-list-consolidation.html
+
+        * svg/properties/SVGTransformListPropertyTearOff.h:
+        (WebCore::SVGTransformListPropertyTearOff::consolidate):
+
 2010-11-19  Jay Civelli  <jcivelli at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebCore/svg/properties/SVGTransformListPropertyTearOff.h b/WebCore/svg/properties/SVGTransformListPropertyTearOff.h
index 636871a..3739348 100644
--- a/WebCore/svg/properties/SVGTransformListPropertyTearOff.h
+++ b/WebCore/svg/properties/SVGTransformListPropertyTearOff.h
@@ -53,6 +53,10 @@ public:
         ListWrapperCache& wrappers = m_animatedProperty->wrappers();
         ASSERT(values.size() == wrappers.size());
 
+        // Spec: If the list was empty, then a value of null is returned.
+        if (values.isEmpty())
+            return 0;
+
         m_animatedProperty->detachListWrappers(0);
         RefPtr<SVGPropertyTearOff<SVGTransform> > wrapper = SVGPropertyTearOff<SVGTransform>::create(values.consolidate());
         wrappers.append(wrapper);

-- 
WebKit Debian packaging

