Fix hashless-hex-color.html quirks-mode test

third_party/WebKit/Source/core/css/parser/CSSPropertyParserHelpers.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/parser/CSSPropertyParserHelpers.h"
 
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/CSSStringValue.h"
 #include "core/css/CSSValuePair.h"
 // TODO(timloh): Remove this dependency
@@ skipping 386 matching lines @@
         alpha = clampTo<double>(alpha, 0.0, 1.0);
     }
     result = makeRGBAFromHSLA(colorArray[0], colorArray[1], colorArray[2], alpha);
     return args.atEnd();
 }
 
 static bool parseHexColor(CSSParserTokenRange& range, RGBA32& result, bool acceptQuirkyColors)
 {
     const CSSParserToken& token = range.peek();
     String color;
-    if (acceptQuirkyColors) {
+    if (token.type() == HashToken) {
+        color = token.value();
+    } else if (acceptQuirkyColors) {
         if (token.type() == NumberToken || token.type() == DimensionToken) {
             if (token.numericValueType() != IntegerValueType
                 || token.numericValue() < 0. || token.numericValue() >= 1000000.)
                 return false;
             if (token.type() == NumberToken) // e.g. 112233
                 color = String::format("%d", static_cast<int>(token.numericValue()));
             else // e.g. 0001FF
                 color = String::number(static_cast<int>(token.numericValue())) + String(token.value());
             while (color.length() < 6)
                 color = "0" + color;
         } else if (token.type() == IdentToken) { // e.g. FF0000
-            unsigned length = token.value().length();
-            if (length != 3 && length != 6)
-                return false;
             color = token.value();
         }
+        unsigned length = color.length();
+        if (length != 3 && length != 6)
+            return false;
     }
-    if (token.type() == HashToken)
-        color = token.value();
     if (!Color::parseHexColor(color, result))
         return false;
     range.consumeIncludingWhitespace();
     return true;
 }
 
 static bool parseColorFunction(CSSParserTokenRange& range, RGBA32& result)
 {
     CSSValueID functionId = range.peek().functionId();
     if (functionId < CSSValueRgb || functionId > CSSValueHsla)
@@ skipping 156 matching lines @@
     if (!value2) {
         positionFromOneValue(value1, resultX, resultY);
         return true;
     }
     return positionFromTwoValues(value1, value2, resultX, resultY);
 }
 
 } // namespace CSSPropertyParserHelpers
 
 } // namespace blink