[SVGDom] Improve whitespace handling in style parsing

experimental/svg/model/SkSVGDOM.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkDOM.h"
 #include "SkParse.h"
@@ skipping 108 matching lines @@
 
     std::tuple<SkString, SkString> next() {
         SkString name, value;
 
         if (fPos) {
             const char* sep = this->nextSeparator();
             SkASSERT(*sep == ';' || *sep == '\0');
 
             const char* valueSep = strchr(fPos, ':');
             if (valueSep && valueSep < sep) {
-                name.set(fPos, valueSep - fPos);
-                value.set(valueSep + 1, sep - valueSep - 1);
+                name  = TrimmedString(fPos, valueSep - 1);
+                value = TrimmedString(valueSep + 1, sep - 1);
             }
 
             fPos = *sep ? sep + 1 : nullptr;
         }
 
         return std::make_tuple(name, value);
     }
 
 private:
     const char* nextSeparator() const {
         const char* sep = fPos;
         while (*sep != ';' && *sep != '\0') {
             sep++;
         }
         return sep;
     }
 

[robertphillips, 2016/08/08 12:39:30]

Does this need to be class-scoped? It seems like this would be more generally
useful.

[f(malita), 2016/08/08 13:00:02]

Done/moved out of the class.

+    static SkString TrimmedString(const char* first, const char* last) {
+        SkASSERT(first);
+        SkASSERT(last);
+        SkASSERT(first <= last);
+
+        while (first <= last && *first <= ' ') { first++; }
+        while (first <= last && *last  <= ' ') { last--; }
+
+        SkASSERT(last - first + 1 >= 0);
+        return SkString(first, SkTo<size_t>(last - first + 1));
+    }
+
     const char* fPos;
 };
 
 void set_string_attribute(const sk_sp<SkSVGNode>& node, const char* name, const char* value);
 
 bool SetStyleAttributes(const sk_sp<SkSVGNode>& node, SkSVGAttribute,
                         const char* stringValue) {
 
     SkString name, value;
     StyleIterator iter(stringValue);
@@ skipping 136 matching lines @@
     if (fRoot) {
         SkSVGRenderContext ctx(fContainerSize);
         fRoot->render(canvas, ctx);
     }
 }
 
 void SkSVGDOM::setContainerSize(const SkSize& containerSize) {
     // TODO: inval
     fContainerSize = containerSize;
 }