Changeset 222402 in webkit for trunk/Source/WebCore/css/CSSVariableData.cpp

Timestamp:

Sep 22, 2017, 1:15:14 PM (8 years ago)

Author:

[email protected]

Message:

Add env() as an alias of constant()
​https://bugs.webkit.org/show_bug.cgi?id=177371

Reviewed by Simon Fraser.

Source/WebCore:

• css/CSSValueKeywords.in:
• css/CSSVariableData.cpp:

(WebCore::CSSVariableData::checkVariablesForCyclesWithRange const):
(WebCore::CSSVariableData::resolveTokenRange const):

• css/parser/CSSVariableParser.cpp:

(WebCore::classifyBlock):
Add env() as an alias of constant() everywhere it is mentioned.

Source/WebInspectorUI:

• UserInterface/Models/CSSKeywordCompletions.js:

(WI.CSSKeywordCompletions.forProperty):
(WI.CSSKeywordCompletions.forFunction):
Add autocomplete support for env().

LayoutTests:

• TestExpectations:
• platform/ios-11/TestExpectations:

Duplicated constant() tests with env() instead.

File:

• trunk/Source/WebCore/css/CSSVariableData.cpp (modified) (2 diffs)

trunk/Source/WebCore/css/CSSVariableData.cpp

@@ -101 +101 @@
 {
     while (!range.atEnd()) {
-        if (range.peek().functionId() == CSSValueVar || range.peek().functionId() == CSSValueConstant) {
+        if (range.peek().functionId() == CSSValueVar || range.peek().functionId() == CSSValueConstant || range.peek().functionId() == CSSValueEnv) {
             CSSParserTokenRange block = range.consumeBlock();
             
@@ -171 +171 @@
     bool success = true;
     while (!range.atEnd()) {
-        if (range.peek().functionId() == CSSValueVar || range.peek().functionId() == CSSValueConstant)
+        if (range.peek().functionId() == CSSValueVar || range.peek().functionId() == CSSValueConstant || range.peek().functionId() == CSSValueEnv)
             success &= resolveVariableReference(customProperties, range.consumeBlock(), result);
         else