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

[mdelaney at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 069db487e63f64705a8957c782623411eee86cd4
Author: mdelaney at apple.com <mdelaney at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 1 22:40:25 2010 +0000

    2010-11-01  Matthew Delaney  <mdelaney at apple.com>
    
            Reviewed by Simon Fraser.
    
            Setting attr repeatDur=0 on SVG element causes hang
            https://bugs.webkit.org/show_bug.cgi?id=48785
    
            Test: svg/animations/repeatDur-zero.xhtml
    
            * svg/animation/SVGSMILElement.cpp: Fixing bound checking for legal repeatDur values.
    2010-11-01  Matthew Delaney  <mdelaney at apple.com>
    
            Reviewed by Simon Fraser.
    
            Setting attr repeatDur=0 on SVG element causes hang
            https://bugs.webkit.org/show_bug.cgi?id=48785
    
            * svg/animations/repeatDur-zero.xhtml: Added. Tests if setting attr repeatDur=0 causes a hang or not.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71066 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b4f3db9..15f07cc 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-01  Matthew Delaney  <mdelaney at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Setting attr repeatDur=0 on SVG element causes hang
+        https://bugs.webkit.org/show_bug.cgi?id=48785
+
+        * svg/animations/repeatDur-zero.xhtml: Added. Tests if setting attr repeatDur=0 causes a hang or not.
+
 2010-11-01  Dmitry Titov  <dimich at chromium.org>
 
         [Chromium] Unreviewed test rebaseline.
diff --git a/LayoutTests/platform/mac/svg/animations/repeatDur-zero-expected.txt b/LayoutTests/platform/mac/svg/animations/repeatDur-zero-expected.txt
new file mode 100644
index 0000000..3537a1e
--- /dev/null
+++ b/LayoutTests/platform/mac/svg/animations/repeatDur-zero-expected.txt
@@ -0,0 +1,7 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderSVGRoot {svg} at (5,5) size 93x18
+    RenderSVGText {text} at (5,5) size 93x18 contains 1 chunk(s)
+      RenderSVGInlineText {#text} at (0,0) size 93x18
+        chunk 1 text run 1 at (5.00,20.00) startOffset 0 endOffset 12 width 93.00: "Test Passes."
diff --git a/LayoutTests/svg/animations/repeatDur-zero.xhtml b/LayoutTests/svg/animations/repeatDur-zero.xhtml
new file mode 100644
index 0000000..dbf20bd
--- /dev/null
+++ b/LayoutTests/svg/animations/repeatDur-zero.xhtml
@@ -0,0 +1,9 @@
+<?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="100%" height="100%" version="1.1"
+xmlns="http://www.w3.org/2000/svg">
+<set repeatDur="0"/>
+<text x="5" y="20" font-family="Verdana" font-size="15">
+Test Passes.
+</text>
+</svg>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 38d61ea..aae0bb8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-01  Matthew Delaney  <mdelaney at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Setting attr repeatDur=0 on SVG element causes hang
+        https://bugs.webkit.org/show_bug.cgi?id=48785
+
+        Test: svg/animations/repeatDur-zero.xhtml
+
+        * svg/animation/SVGSMILElement.cpp: Fixing bound checking for legal repeatDur values.
+
 2010-10-31  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/svg/animation/SVGSMILElement.cpp b/WebCore/svg/animation/SVGSMILElement.cpp
index a90b444..6757fee 100644
--- a/WebCore/svg/animation/SVGSMILElement.cpp
+++ b/WebCore/svg/animation/SVGSMILElement.cpp
@@ -528,7 +528,8 @@ SMILTime SVGSMILElement::repeatDur() const
         return m_cachedRepeatDur;
     const AtomicString& value = getAttribute(SVGNames::repeatDurAttr);
     SMILTime clockValue = parseClockValue(value);
-    return m_cachedRepeatDur = clockValue < 0 ? SMILTime::unresolved() : clockValue;
+    m_cachedRepeatDur = clockValue <= 0 ? SMILTime::unresolved() : clockValue;
+    return m_cachedRepeatDur;
 }
     
 // So a count is not really a time but let just all pretend we did not notice.

-- 
WebKit Debian packaging