Parse outline shorthand in CSSPropertyParser with CSSParserTokens

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

 // Copyright 2015 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 "config.h"
 #include "core/css/parser/CSSPropertyParser.h"
 
 #include "core/StylePropertyShorthand.h"
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/CSSCustomIdentValue.h"
@@ skipping 1487 matching lines @@
         if (list->hasValue(ident.get()))
             return nullptr;
         list->append(ident.release());
     }
 
     if (!list->length())
         return nullptr;
     return list.release();
 }
 
+static PassRefPtrWillBeRawPtr<CSSValue> consumeOutlineColor(CSSParserTokenRange& range, const CSSParserContext& context)
+{
+    // Outline color has "invert" as additional keyword.
+    // Also, we want to allow the special focus color even in HTML Standard parsing mode.
+    if (range.peek().id() == CSSValueInvert || range.peek().id() == CSSValueWebkitFocusRingColor)
+        return consumeIdent(range);
+    return consumeColor(range, context);
+}
+
+static PassRefPtrWillBeRawPtr<CSSPrimitiveValue> consumeBorderWidth(CSSParserTokenRange& range, CSSParserMode cssParserMode)

[Timothy Loh, 2015/11/05 05:08:26]

The spec calls this a <line-width> for the border-width properties, so maybe
consumeLineWidth is better. Otherwise it's slightly confusing because calling
this isn't sufficient for parsing the border-width property :-)

+{
+    CSSValueID id = range.peek().id();
+    if (id == CSSValueThin || id == CSSValueMedium || id == CSSValueThick)
+        return consumeIdent(range);
+    return consumeLength(range, cssParserMode, ValueRangeNonNegative);
+}
+
 PassRefPtrWillBeRawPtr<CSSValue> CSSPropertyParser::parseSingleValue(CSSPropertyID unresolvedProperty)
 {
     CSSPropertyID property = resolveCSSPropertyID(unresolvedProperty);
     m_range.consumeWhitespace();
     switch (property) {
     case CSSPropertyWillChange:
         return consumeWillChange(m_range);
     case CSSPropertyPage:
         return consumePage(m_range);
     case CSSPropertyQuotes:
@@ skipping 96 matching lines @@
         return consumeZIndex(m_range);
     case CSSPropertyTextShadow: // CSS2 property, dropped in CSS2.1, back in CSS3, so treat as CSS3
     case CSSPropertyBoxShadow:
         return consumeShadow(m_range, m_context, property == CSSPropertyBoxShadow);
     case CSSPropertyWebkitFilter:
     case CSSPropertyBackdropFilter:
         return consumeFilter(m_range, m_context);
     case CSSPropertyWebkitTextDecorationsInEffect:
     case CSSPropertyTextDecorationLine:
         return consumeTextDecorationLine(m_range);
+    case CSSPropertyOutlineColor:
+        return consumeOutlineColor(m_range, m_context);
+    case CSSPropertyOutlineOffset:
+        return consumeLength(m_range, m_context.mode(), ValueRangeAll);
+    case CSSPropertyOutlineWidth:
+        return consumeBorderWidth(m_range, m_context.mode());
     default:
         return nullptr;
     }
 }
 
 static PassRefPtrWillBeRawPtr<CSSValueList> consumeFontFaceUnicodeRange(CSSParserTokenRange& range)
 {
     RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createCommaSeparated();
 
     do {
@@ skipping 451 matching lines @@
         // Fall through 'text-decoration-line' parsing if CSS 3 Text Decoration
         // is disabled to match CSS 2.1 rules for parsing 'text-decoration'.
         if (RuntimeEnabledFeatures::css3TextDecorationsEnabled())
             return consumeShorthandGreedily(textDecorationShorthand(), important);
         RefPtrWillBeRawPtr<CSSValue> textDecoration = consumeTextDecorationLine(m_range);
         if (!textDecoration || !m_range.atEnd())
             return false;
         addProperty(CSSPropertyTextDecoration, textDecoration.release(), important);
         return true;
     }
+    case CSSPropertyOutline:
+        return consumeShorthandGreedily(outlineShorthand(), important);
     default:
         m_currentShorthand = oldShorthand;
         return false;
     }
 }
 
 } // namespace blink