[SVGDom] Improve whitespace handling in style parsing

experimental/svg/model/SkSVGAttributeParser.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 "SkParse.h"
 #include "SkSVGAttributeParser.h"
 #include "SkSVGTypes.h"
@@ skipping 134 matching lines @@
     }
 
     *c = v | 0xff000000;
     return true;
 }
 
 // https://www.w3.org/TR/SVG/types.html#DataTypeColor
 bool SkSVGAttributeParser::parseColor(SkSVGColor* color) {
     SkColor c;
 
+    // consume preceding whitespace
+    this->parseWSToken();
+
     // TODO: rgb(...)
     if (this->parseHexColorToken(&c) || this->parseNamedColorToken(&c)) {
         *color = SkSVGColor(c);
-        return true;
+
+        // consume trailing whitespace
+        this->parseWSToken();
     }
 

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

Do we need to init 'color' to something in case the string is all white space?

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

All SVG types have default constructors, so color is already default-initialized
by the caller (an unfortunate side-effect of the current out-param parser API;
maybe we can refactor to avoid?).  Good point about empty string parsing though,
we should not return success in that case.

Done.

-    return false;
+    return this->parseEOSToken();
 }
 
 // https://www.w3.org/TR/SVG/types.html#DataTypeNumber
 bool SkSVGAttributeParser::parseNumber(SkSVGNumber* number) {
     // consume WS
     this->parseWSToken();
 
     SkScalar s;
     if (this->parseScalarToken(&s)) {
         *number = SkSVGNumber(s);
@@ skipping 13 matching lines @@
     if (this->parseScalarToken(&s) &&
         (this->parseLengthUnitToken(&u) || this->parseSepToken() || this->parseEOSToken())) {
         *length = SkSVGLength(s, u);
         // consume trailing separators
         this->parseSepToken();
         return true;
     }
 
     return false;
 }