<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[29027] trunk/WebCore</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/29027">29027</a></dd>
<dt>Author</dt> <dd>zimmermann@webkit.org</dd>
<dt>Date</dt> <dd>2007-12-29 04:50:57 -0800 (Sat, 29 Dec 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Reviewed by Oliver.

Refactor SVGAnimationElement::parseValues into a generic function parseDelimitedString.
SVGAnimationElement needs to parse semicolon-seperated strings, SVGGlyphElement comma-seperated.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoresvgSVGAnimationElementcpp">trunk/WebCore/svg/SVGAnimationElement.cpp</a></li>
<li><a href="#trunkWebCoresvgSVGParserUtilitiescpp">trunk/WebCore/svg/SVGParserUtilities.cpp</a></li>
<li><a href="#trunkWebCoresvgSVGParserUtilitiesh">trunk/WebCore/svg/SVGParserUtilities.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (29026 => 29027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2007-12-29 11:59:50 UTC (rev 29026)
+++ trunk/WebCore/ChangeLog        2007-12-29 12:50:57 UTC (rev 29027)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2007-12-29  Nikolas Zimmermann  &lt;zimmermann@kde.org&gt;
</span><span class="cx"> 
</span><ins>+        Reviewed by Oliver.
+
+        Refactor SVGAnimationElement::parseValues into a generic function parseDelimitedString.
+        SVGAnimationElement needs to parse semicolon-seperated strings, SVGGlyphElement comma-seperated.
+
+        * svg/SVGAnimationElement.cpp:
+        (WebCore::SVGAnimationElement::parseMappedAttribute):
+        * svg/SVGParserUtilities.cpp:
+        (WebCore::parseDelimitedString):
+        * svg/SVGParserUtilities.h:
+
+2007-12-29  Nikolas Zimmermann  &lt;zimmermann@kde.org&gt;
+
</ins><span class="cx">         Reviewed by Maciej.
</span><span class="cx"> 
</span><span class="cx">         Add new helper structure SVGFontData - FontData holds this object as OwnPtr.
</span></span></pre></div>
<a id="trunkWebCoresvgSVGAnimationElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/svg/SVGAnimationElement.cpp (29026 => 29027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/svg/SVGAnimationElement.cpp        2007-12-29 11:59:50 UTC (rev 29026)
+++ trunk/WebCore/svg/SVGAnimationElement.cpp        2007-12-29 12:50:57 UTC (rev 29027)
</span><span class="lines">@@ -137,30 +137,6 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void parseValues(Vector&lt;String&gt;&amp; values, const String&amp; value)
-{
-    const UChar* ptr = value.characters();
-    const UChar* end = ptr + value.length();
-    skipOptionalSpaces(ptr, end);
-    while (ptr &lt; end) {
-        // SMIL 3.2.2 : Leading and trailing white space, and white space before and after semicolon separators, will be ignored.
-        const UChar* valueStart = ptr;
-        while (ptr &lt; end &amp;&amp; *ptr != ';') // careful not to ignore whitespace inside values
-            ptr++;
-        if (ptr == valueStart)
-            break;
-        
-        // walk backwards from the ; to ignore any whitespace
-        const UChar* valueEnd = ptr - 1;
-        while (valueStart &lt; valueEnd &amp;&amp; isWhitespace(*valueEnd))
-            valueEnd--;
-        
-        values.append(String(valueStart, valueEnd - valueStart + 1));
-        
-        skipOptionalSpacesOrDelimiter(ptr, end, ';');
-    }
-}
-
</del><span class="cx"> static void parseKeySplines(Vector&lt;SVGAnimationElement::KeySpline&gt;&amp; keySplines, const String&amp; value)
</span><span class="cx"> {
</span><span class="cx">     float number = 0.0f;
</span><span class="lines">@@ -301,7 +277,7 @@
</span><span class="cx">             m_calcMode = CALCMODE_PACED;
</span><span class="cx">     } else if (attr-&gt;name() == SVGNames::valuesAttr) {
</span><span class="cx">         m_values.clear();
</span><del>-        parseValues(m_values, attr-&gt;value());
</del><ins>+        m_values = parseDelimitedString(attr-&gt;value(), ';');
</ins><span class="cx">     } else if (attr-&gt;name() == SVGNames::keyTimesAttr) {
</span><span class="cx">         m_keyTimes.clear();
</span><span class="cx">         parseKeyNumbers(m_keyTimes, attr-&gt;value());
</span></span></pre></div>
<a id="trunkWebCoresvgSVGParserUtilitiescpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/svg/SVGParserUtilities.cpp (29026 => 29027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/svg/SVGParserUtilities.cpp        2007-12-29 11:59:50 UTC (rev 29026)
+++ trunk/WebCore/svg/SVGParserUtilities.cpp        2007-12-29 12:50:57 UTC (rev 29027)
</span><span class="lines">@@ -839,7 +839,35 @@
</span><span class="cx">     return builder.build(path, d, process);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+Vector&lt;String&gt; parseDelimitedString(const String&amp; input, const char seperator)
+{
+    Vector&lt;String&gt; values;
+
+    const UChar* ptr = input.characters();
+    const UChar* end = ptr + input.length();
+    skipOptionalSpaces(ptr, end);
+
+    while (ptr &lt; end) {
+        // Leading and trailing white space, and white space before and after semicolon separators, will be ignored.
+        const UChar* inputStart = ptr;
+        while (ptr &lt; end &amp;&amp; *ptr != seperator) // careful not to ignore whitespace inside inputs
+            ptr++;
+
+        if (ptr == inputStart)
+            break;
+
+        // walk backwards from the ; to ignore any whitespace
+        const UChar* inputEnd = ptr - 1;
+        while (inputStart &lt; inputEnd &amp;&amp; isWhitespace(*inputEnd))
+            inputEnd--;
+
+        values.append(String(inputStart, inputEnd - inputStart + 1));
+        skipOptionalSpacesOrDelimiter(ptr, end, seperator);
+    }
+
+    return values;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-// vim:ts=4:noet
</del><ins>+}
+
</ins><span class="cx"> #endif // ENABLE(SVG)
</span></span></pre></div>
<a id="trunkWebCoresvgSVGParserUtilitiesh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/svg/SVGParserUtilities.h (29026 => 29027)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/svg/SVGParserUtilities.h        2007-12-29 11:59:50 UTC (rev 29026)
+++ trunk/WebCore/svg/SVGParserUtilities.h        2007-12-29 12:50:57 UTC (rev 29027)
</span><span class="lines">@@ -84,10 +84,9 @@
</span><span class="cx">     bool pointsListFromSVGData(SVGPointList* pointsList, const String&amp; points);
</span><span class="cx">     bool pathFromSVGData(Path&amp; path, const String&amp; d);
</span><span class="cx">     bool pathSegListFromSVGData(SVGPathSegList* pathSegList, const String&amp; d, bool process = false);
</span><ins>+    Vector&lt;String&gt; parseDelimitedString(const String&amp; input, const char seperator);
</ins><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif // ENABLE(SVG)
</span><span class="cx"> #endif
</span><del>-
-// vim:ts=4:noet
</del></span></pre>
</div>
</div>

</body>
</html>