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

Timestamp:

Oct 6, 2018, 6:57:16 AM (7 years ago)

Author:

[email protected]

Message:

Properly determine if css custom property values are computationally independent
​https://bugs.webkit.org/show_bug.cgi?id=190303

Patch by Justin Michaud <Justin Michaud> on 2018-10-06
Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-properties-values-api/register-property-syntax-parsing-expected.txt:
• web-platform-tests/css/css-properties-values-api/registered-property-computation-expected.txt:

Source/WebCore:

Add getDirectComputationalDependencies method to determine if a value is computationally
dependent. Use this method in CSS.registerProperty to replace existing substring checks.
No new tests are needed because the existing tests cover this behaviour.

• css/CSSCalculationValue.cpp:

(WebCore::determineCategory):

• css/CSSCalculationValue.h:

(WebCore::CSSCalcValue::getDirectComputationalDependencies const):
(WebCore::CSSCalcValue::getDirectRootComputationalDependencies const):

• css/CSSCustomPropertyValue.cpp:

(WebCore::CSSCustomPropertyValue::customCSSText const):
(WebCore::CSSCustomPropertyValue::tokens const):
(WebCore::CSSCustomPropertyValue::setResolvedTypedValue):

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

(WebCore::CSSPrimitiveValue::getDirectComputationalDependencies const):
(WebCore::CSSPrimitiveValue::getDirectRootComputationalDependencies const):

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

(WebCore::CSSValue::getDirectComputationalDependencies const):
(WebCore::CSSValue::getDirectRootComputationalDependencies const):

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

(WebCore::CSSVariableData::CSSVariableData):
(WebCore::CSSVariableData::resolveVariableReference const):

• css/DOMCSSRegisterCustomProperty.cpp:

(WebCore::DOMCSSRegisterCustomProperty::registerProperty):

File:

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

trunk/Source/WebCore/css/CSSVariableData.cpp

@@ -33 +33 @@
 #include "CSSCustomPropertyValue.h"
 #include "CSSParserTokenRange.h"
-#include "CSSTokenizer.h"
 #include "CSSValuePool.h"
 #include "RenderStyle.h"
@@ -82 +81 @@
     : m_needsVariableResolution(needsVariableResolution)
 {
-    ASSERT(!range.atEnd());
     consumeAndUpdateTokens(range);
 }
@@ -147 +145 @@
     auto* property = style.getCustomProperty(variableName);
     if (property && property->resolvedTypedValue()) {
-        // FIXME: we should not have to serialize a value that was already resolved.
-        auto textValue = CSSValuePool::singleton().createValue(*property->resolvedTypedValue(), style)->cssText();
-        CSSTokenizer tokenizer(textValue);
-        auto tokenizerRange = tokenizer.tokenRange();
-        while (!tokenizerRange.atEnd())
-            result.append(tokenizerRange.consume());
+        result.appendVector(property->tokens(registeredProperties, style));
         return true;
     }
@@ -164 +157 @@
     }
     ASSERT(property);
-    
-    if (property->containsVariables()) {
-        // FIXME: Avoid doing this work more than once.
-        RefPtr<CSSVariableData> resolvedData = property->value()->resolveVariableReferences(registeredProperties, style);
-        if (!resolvedData)
-            return false;
-        result.appendVector(resolvedData->tokens());
-    } else
-        result.appendVector(property->value()->tokens());
+    result.appendVector(property->tokens(registeredProperties, style));
     
     return true;