Changeset 57140 in webkit

Timestamp:

Apr 6, 2010 3:37:25 AM (14 years ago)

Author:

krit@webkit.org

Message:

2010-04-06 Dirk Schulze <​krit@webkit.org>

Reviewed by Oliver Hunt.

SVG/SMIL parse failure on attribute keySplines
​https://bugs.webkit.org/show_bug.cgi?id=37071

Test: svg/animations/animate-keySplines.html

The String in 'keySplines' can have multiple spaces between numbers
and delimiters. The parsing code is inspired by SVGParserUtilities
and respects this.

• svg/SVGAnimationElement.cpp: (WebCore::parseKeySplines):

2010-04-06 Dirk Schulze <​krit@webkit.org>

Reviewed by Oliver Hunt.

SVG/SMIL parse failure on attribute keySplines
​https://bugs.webkit.org/show_bug.cgi?id=37071

Test correct parsing of keySplines.

• svg/animations/animate-keySplines-expected.txt: Added.
• svg/animations/animate-keySplines.html: Added.
• svg/animations/script-tests/animate-keySplines.js: Added. (sample1): (sample2): (sample3): (executeTest):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/animations/animate-keySplines-expected.txt (added)
• LayoutTests/svg/animations/animate-keySplines.html (added)
• LayoutTests/svg/animations/script-tests/animate-keySplines.js (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/svg/SVGAnimationElement.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-04-06  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        SVG/SMIL parse failure on attribute keySplines
+        https://bugs.webkit.org/show_bug.cgi?id=37071
+
+        Test correct parsing of keySplines.
+
+        * svg/animations/animate-keySplines-expected.txt: Added.
+        * svg/animations/animate-keySplines.html: Added.
+        * svg/animations/script-tests/animate-keySplines.js: Added.
+        (sample1):
+        (sample2):
+        (sample3):
+        (executeTest):
+
 2010-04-06  Pavel Feldman  <pfeldman@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-06  Dirk Schulze  <krit@webkit.org>
+
+        Reviewed by Oliver Hunt.
+
+        SVG/SMIL parse failure on attribute keySplines
+        https://bugs.webkit.org/show_bug.cgi?id=37071
+
+        Test: svg/animations/animate-keySplines.html
+
+        The String in 'keySplines' can have multiple spaces between numbers
+        and delimiters. The parsing code is inspired by SVGParserUtilities
+        and respects this.
+
+        * svg/SVGAnimationElement.cpp:
+        (WebCore::parseKeySplines):
+
 2010-04-06  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebCore/svg/SVGAnimationElement.cpp

@@ -5 +5 @@
     Copyright (C) 2008 Apple Inc. All rights reserved.
     Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
+    Copyright (C) Research In Motion Limited 2010. All rights reserved.
 
     This library is free software; you can redistribute it and/or
@@ -37 +38 @@
 #include "HTMLNames.h"
 #include "MappedAttribute.h"
+#include "PlatformString.h"
 #include "RenderObject.h"
 #include "SVGElementInstance.h"
 #include "SVGNames.h"
+#include "SVGParserUtilities.h"
 #include "SVGURIReference.h"
 #include "SVGUseElement.h"
@@ -90 +93 @@
 {
     result.clear();
-    Vector<String> parseList;
-    parse.split(';', parseList);
-    for (unsigned n = 0; n < parseList.size(); ++n) {
-        Vector<String> parseSpline;
-        parseList[n].split(',', parseSpline);
-        // The spec says the sepator is a space, all tests use commas. Weird.
-        if (parseSpline.size() == 1) 
-            parseList[n].split(' ', parseSpline);
-        if (parseSpline.size() != 4)
-            goto fail;
-        double curveValues[4];
-        for (unsigned i = 0; i < 4; ++i) {
-            String parseNumber = parseSpline[i]; 
-            bool ok;
-            curveValues[i] = parseNumber.toDouble(&ok);
-            if (!ok || curveValues[i] < 0.0 || curveValues[i] > 1.0)
-                goto fail;
-        }
-        result.append(UnitBezier(curveValues[0], curveValues[1], curveValues[2], curveValues[3]));
-    }
-    return;
-fail:
-    result.clear();
+    if (parse.isEmpty())
+        return;
+    const UChar* cur = parse.characters();
+    const UChar* end = cur + parse.length();
+
+    skipOptionalSpaces(cur, end);
+
+    bool delimParsed = false;
+    while (cur < end) {
+        delimParsed = false;
+        float posA = 0.0f;
+        if (!parseNumber(cur, end, posA)) {
+            result.clear();
+            return;
+        }
+
+        float posB = 0.0f;
+        if (!parseNumber(cur, end, posB)) {
+            result.clear();
+            return;
+        }
+
+        float posC = 0.0f;
+        if (!parseNumber(cur, end, posC)) {
+            result.clear();
+            return;
+        }
+
+        float posD = 0.0f;
+        if (!parseNumber(cur, end, posD, false)) {
+            result.clear();
+            return;
+        }
+
+        skipOptionalSpaces(cur, end);
+
+        if (cur < end && *cur == ';') {
+            delimParsed = true;
+            cur++;
+        }
+        skipOptionalSpaces(cur, end);
+
+        result.append(UnitBezier(posA, posB, posC, posD));
+    }
+    if (!(cur == end && !delimParsed))
+        result.clear();
 }