Changeset 205869 in webkit for trunk/Source/WebCore/css/CSSValue.cpp

Timestamp:

Sep 13, 2016, 12:08:30 PM (9 years ago)

Author:

[email protected]

Message:

[CSS Parser] Add CSS Variable Parsing support
​https://bugs.webkit.org/show_bug.cgi?id=161916

Reviewed by Dean Jackson.

This patch not only adds the parser for CSS variables (from Blink), but it also brings in
all of the data structures used to store variables and custom property declarations. We
will be abandoning our old data structures eventually in favor of these new ones. They
are not significantly different other than operating on the CSSParserTokenRanges rather
than the soon-to-be-removed parser value lists.

• CMakeLists.txt:
• WebCore.xcodeproj/project.pbxproj:
• css/CSSCustomIdentValue.cpp: Added.

(WebCore::CSSCustomIdentValue::CSSCustomIdentValue):
(WebCore::CSSCustomIdentValue::customCSSText):

• css/CSSCustomIdentValue.h: Added.

(WebCore::CSSCustomIdentValue::create):
(WebCore::CSSCustomIdentValue::value):
(WebCore::CSSCustomIdentValue::isKnownPropertyID):
(WebCore::CSSCustomIdentValue::valueAsPropertyID):
(WebCore::CSSCustomIdentValue::equals):

• css/CSSCustomPropertyDeclaration.cpp: Added.

(WebCore::CSSCustomPropertyDeclaration::customCSSText):

• css/CSSCustomPropertyDeclaration.h: Added.

(WebCore::CSSCustomPropertyDeclaration::create):
(WebCore::CSSCustomPropertyDeclaration::name):
(WebCore::CSSCustomPropertyDeclaration::value):
(WebCore::CSSCustomPropertyDeclaration::id):
(WebCore::CSSCustomPropertyDeclaration::equals):
(WebCore::CSSCustomPropertyDeclaration::CSSCustomPropertyDeclaration):

• css/CSSCustomPropertyValue.h:
• css/CSSValue.cpp:

(WebCore::CSSValue::cssText):
(WebCore::CSSValue::destroy):

• css/CSSValue.h:

(WebCore::CSSValue::isCustomPropertyDeclaration):
(WebCore::CSSValue::isCustomIdentValue):
(WebCore::CSSValue::isVariableReferenceValue):

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

(WebCore::CSSVariableData::updateTokens):
(WebCore::CSSVariableData::operator==):
(WebCore::CSSVariableData::consumeAndUpdateTokens):
(WebCore::CSSVariableData::CSSVariableData):

• css/CSSVariableData.h: Added.

(WebCore::CSSVariableData::create):
(WebCore::CSSVariableData::createResolved):
(WebCore::CSSVariableData::tokenRange):
(WebCore::CSSVariableData::tokens):
(WebCore::CSSVariableData::needsVariableResolution):
(WebCore::CSSVariableData::CSSVariableData):

• css/CSSVariableDependentValue.h:
• css/CSSVariableReferenceValue.cpp: Added.

(WebCore::CSSVariableReferenceValue::customCSSText):

• css/CSSVariableReferenceValue.h: Added.

(WebCore::CSSVariableReferenceValue::create):
(WebCore::CSSVariableReferenceValue::variableDataValue):
(WebCore::CSSVariableReferenceValue::equals):
(WebCore::CSSVariableReferenceValue::CSSVariableReferenceValue):

• css/CSSVariableValue.h:
• css/parser/CSSParserImpl.cpp:

(WebCore::filterProperties):
(WebCore::CSSParserImpl::consumeDeclaration):
(WebCore::CSSParserImpl::consumeVariableValue):

• css/parser/CSSVariableParser.cpp: Added.

(WebCore::CSSVariableParser::isValidVariableName):
(WebCore::classifyBlock):
(WebCore::isValidVariableReference):
(WebCore::classifyVariableRange):
(WebCore::CSSVariableParser::containsValidVariableReferences):
(WebCore::CSSVariableParser::parseDeclarationValue):

• css/parser/CSSVariableParser.h: Added.

File:

• trunk/Source/WebCore/css/CSSValue.cpp (modified) (4 diffs)

trunk/Source/WebCore/css/CSSValue.cpp

@@ -37 +37 @@
 #include "CSSCrossfadeValue.h"
 #include "CSSCursorImageValue.h"
+#include "CSSCustomIdentValue.h"
+#include "CSSCustomPropertyDeclaration.h"
 #include "CSSCustomPropertyValue.h"
 #include "CSSFilterImageValue.h"
@@ -59 +61 @@
 #include "CSSValueList.h"
 #include "CSSVariableDependentValue.h"
+#include "CSSVariableReferenceValue.h"
 #include "CSSVariableValue.h"
 #include "SVGColor.h"
@@ -363 +366 @@
     case VariableClass:
         return downcast<CSSVariableValue>(*this).customCSSText();
+    case CustomPropertyDeclarationClass:
+        return downcast<CSSCustomPropertyDeclaration>(*this).customCSSText();
+    case CustomIdentClass:
+        return downcast<CSSCustomIdentValue>(*this).customCSSText();
+    case VariableReferenceClass:
+        return downcast<CSSVariableReferenceValue>(*this).customCSSText();
     }
 
@@ -505 +514 @@
     case VariableClass:
         delete downcast<CSSVariableValue>(this);
+        return;
+    case CustomPropertyDeclarationClass:
+        delete downcast<CSSCustomPropertyDeclaration>(this);
+        return;
+    case CustomIdentClass:
+        delete downcast<CSSCustomIdentValue>(this);
+        return;
+    case VariableReferenceClass:
+        delete downcast<CSSVariableReferenceValue>(this);
         return;
     }