Add CSS support for Containment

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 1759 matching lines @@
         if (list->hasValue(ident.get()))
             return nullptr;
         list->append(ident.release());
     }
 
     if (!list->length())
         return nullptr;
     return list.release();
 }
 
+// none | strict | [ layout || style || paint ]
+static PassRefPtrWillBeRawPtr<CSSValue> consumeContain(CSSParserTokenRange& range)
+{
+    CSSValueID id = range.peek().id();
+    if (id == CSSValueNone)
+        return consumeIdent(range);
+
+    RefPtrWillBeRawPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();

[Timothy Loh, 2015/12/03 05:23:45]

Can we just handle strict separately? e.g.

if (id == CSSValueStrict) {
   list->append(consumeIdent(range))
   return list.release();
}

+    RefPtrWillBeRawPtr<CSSPrimitiveValue> ident = nullptr;
+    bool isStrict = id == CSSValueStrict;
+    while ((ident = consumeIdent<CSSValuePaint, CSSValueLayout, CSSValueStyle, CSSValueStrict>(range))) {
+        if (list->hasValue(ident.get()))
+            return nullptr;
+        if ((list->length() && ident->getValueID() == CSSValueStrict)
+            || (isStrict && ident->getValueID() != CSSValueStrict)) {
+            return nullptr;
+        }
+        list->append(ident.release());
+    }
+
+    if (!list->length())
+        return nullptr;
+    return list.release();
+}
+
 static PassRefPtrWillBeRawPtr<CSSValue> consumeMotionPath(CSSParserTokenRange& range)
 {
     CSSValueID id = range.peek().id();
     if (id == CSSValueNone)
         return consumeIdent(range);
     // FIXME: Add support for <url>, <basic-shape>, <geometry-box>.
     if (range.peek().functionId() != CSSValuePath)
         return nullptr;
 
     // FIXME: Add support for <fill-rule>.
@@ skipping 556 matching lines @@
     case CSSPropertyStrokeWidth:
     case CSSPropertyStrokeDashoffset:
     case CSSPropertyCx:
     case CSSPropertyCy:
     case CSSPropertyX:
     case CSSPropertyY:
     case CSSPropertyR:
     case CSSPropertyRx:
     case CSSPropertyRy:
         return consumeLengthOrPercent(m_range, SVGAttributeMode, ValueRangeAll, UnitlessQuirk::Forbid);
+    case CSSPropertyContain:
+        return consumeContain(m_range);
     default:
         return nullptr;
     }
 }
 
 static PassRefPtrWillBeRawPtr<CSSValueList> consumeFontFaceUnicodeRange(CSSParserTokenRange& range)
 {
     RefPtrWillBeRawPtr<CSSValueList> values = CSSValueList::createCommaSeparated();
 
     do {
@@ skipping 577 matching lines @@
         return consumeShorthandGreedily(flexFlowShorthand(), important);
     case CSSPropertyWebkitColumnRule:
         return consumeShorthandGreedily(webkitColumnRuleShorthand(), important);
     default:
         m_currentShorthand = oldShorthand;
         return false;
     }
 }
 
 } // namespace blink