Changeset 236379 in webkit

Timestamp:

Sep 21, 2018 6:03:48 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Implement initialValue support for CSS Custom Properties and Values API
​https://bugs.webkit.org/show_bug.cgi?id=189819

Patch by Justin Michaud <Justin Michaud> on 2018-09-21
Reviewed by Simon Fraser.

Source/WebCore:

• css/CSSComputedStyleDeclaration.cpp:

(WebCore::ComputedStyleExtractor::customPropertyValue):

• css/CSSCustomPropertyValue.cpp:

(WebCore::CSSCustomPropertyValue::resolveVariableReferences const):

• css/CSSCustomPropertyValue.h:
• css/CSSRegisteredCustomProperty.h:
• css/CSSVariableData.cpp:

(WebCore::CSSVariableData::resolveVariableFallback const):
(WebCore::CSSVariableData::resolveVariableReference const):
(WebCore::CSSVariableData::resolveVariableReferences const):
(WebCore::CSSVariableData::resolveTokenRange const):

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

(WebCore::DOMCSSRegisterCustomProperty::registerProperty):

• css/DOMCSSRegisterCustomProperty.h:
• css/DOMCSSRegisterCustomProperty.idl:
• css/StyleResolver.cpp:

(WebCore::StyleResolver::resolvedVariableValue):
(WebCore::StyleResolver::applyCascadedProperties):

• css/parser/CSSParser.cpp:

(WebCore::CSSParser::parseValueWithVariableReferences):

• css/parser/CSSParser.h:
• dom/Document.h:

(WebCore::Document::getCSSRegisteredCustomPropertySet const):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::checkVariablesInCustomProperties):

• rendering/style/RenderStyle.h:

LayoutTests:

• css-custom-properties-api/initialValue-expected.html: Added.
• css-custom-properties-api/initialValue.html: Added.
• css-custom-properties-api/initialValueJS-expected.txt: Added.
• css-custom-properties-api/initialValueJS.html: Added.
• css-custom-properties-api/registerProperty-expected.txt:
• css-custom-properties-api/registerProperty.html:
• platform/win/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css-custom-properties-api/initialValue-expected.html (added)
• LayoutTests/css-custom-properties-api/initialValue.html (added)
• LayoutTests/css-custom-properties-api/initialValueJS-expected.txt (added)
• LayoutTests/css-custom-properties-api/initialValueJS.html (added)
• LayoutTests/css-custom-properties-api/registerProperty-expected.txt (modified) (1 diff)
• LayoutTests/css-custom-properties-api/registerProperty.html (modified) (2 diffs)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSComputedStyleDeclaration.cpp (modified) (1 diff)
• Source/WebCore/css/CSSCustomPropertyValue.cpp (modified) (2 diffs)
• Source/WebCore/css/CSSCustomPropertyValue.h (modified) (2 diffs)
• Source/WebCore/css/CSSRegisteredCustomProperty.h (modified) (1 diff)
• Source/WebCore/css/CSSVariableData.cpp (modified) (4 diffs)
• Source/WebCore/css/CSSVariableData.h (modified) (3 diffs)
• Source/WebCore/css/DOMCSSRegisterCustomProperty.cpp (modified) (2 diffs)
• Source/WebCore/css/DOMCSSRegisterCustomProperty.h (modified) (2 diffs)
• Source/WebCore/css/DOMCSSRegisterCustomProperty.idl (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (2 diffs)
• Source/WebCore/css/parser/CSSParser.cpp (modified) (3 diffs)
• Source/WebCore/css/parser/CSSParser.h (modified) (2 diffs)
• Source/WebCore/dom/Document.h (modified) (2 diffs)
• Source/WebCore/rendering/style/RenderStyle.cpp (modified) (2 diffs)
• Source/WebCore/rendering/style/RenderStyle.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-09-21  Justin Michaud  <justin_michaud@apple.com>
+
+        Implement initialValue support for CSS Custom Properties and Values API
+        https://bugs.webkit.org/show_bug.cgi?id=189819
+
+        Reviewed by Simon Fraser.
+
+        * css-custom-properties-api/initialValue-expected.html: Added.
+        * css-custom-properties-api/initialValue.html: Added.
+        * css-custom-properties-api/initialValueJS-expected.txt: Added.
+        * css-custom-properties-api/initialValueJS.html: Added.
+        * css-custom-properties-api/registerProperty-expected.txt:
+        * css-custom-properties-api/registerProperty.html:
+        * platform/win/TestExpectations:
+
 2018-09-21  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/css-custom-properties-api/registerProperty-expected.txt

@@ -2 +2 @@
 PASS registerProperty requires a Dictionary type 
 PASS registerProperty requires a name matching <custom-property-name> 
-PASS registerProperty only allows omitting initialValue is syntax is '*' 
+PASS registerProperty always allows omitting initialValue and syntax, requires name and inherits 
+PASS registerProperty requires inherits and name 
 

trunk/LayoutTests/css-custom-properties-api/registerProperty.html

@@ -19 +19 @@
     CSS.registerProperty({name: ['--name', 3], inherits: false});
     // Invalid property names
-    assert_throws(new TypeError(), () => CSS.registerProperty({}));
-    assert_throws(new TypeError(), () => CSS.registerProperty({name: '--no-inherits'}));
     //assert_throws(new SyntaxError(), () => CSS.registerProperty({name: 'no-leading-dash', inherits: false}));
     //assert_throws(new SyntaxError(), () => CSS.registerProperty({name: '', inherits: false}));
@@ -28 +26 @@
     CSS.registerProperty({name: '--syntax-test-1', inherits: false, syntax: '*'});
     CSS.registerProperty({name: '--syntax-test-2', inherits: false, syntax: ' * '});
-    /*assert_throws(new SyntaxError(),
-        () => CSS.registerProperty({name: '--syntax-test-3', syntax: 'length'}));*/
-}, "registerProperty only allows omitting initialValue is syntax is '*'");
+    CSS.registerProperty({name: '--syntax-test-3', inherits: false, initialValue: '500px'});
+    assert_throws(new TypeError(), () => CSS.registerProperty({}));
+    assert_throws(new TypeError(), () => CSS.registerProperty({name: '--no-inherits'}));
+    assert_throws(new TypeError(), () => CSS.registerProperty({inherits: false}));
+    // Repeated name
+    assert_throws(null,
+        () => CSS.registerProperty({name: '--syntax-test-3', inherits: false, initialValue: '500px'}));
+}, "registerProperty always allows omitting initialValue and syntax, requires name and inherits");
+test(function() {
+    CSS.registerProperty({name: '--syntax-test-4', inherits: false, syntax: '*'});
+    CSS.registerProperty({name: '--syntax-test-5', inherits: false, syntax: ' * '});
+}, "registerProperty requires inherits and name");
 </script>

trunk/LayoutTests/platform/win/TestExpectations

@@ -4161 +4161 @@
 imported/blink/http/tests/security/mixedContent/websocket [ Skip ]
 
+# Feature flag only enabled for wk2
+css-custom-properties-api [ Skip ]
+
 editing/pasteboard/drag-and-drop-color-input-events.html [ Skip ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-09-21  Justin Michaud  <justin_michaud@apple.com>
+
+        Implement initialValue support for CSS Custom Properties and Values API
+        https://bugs.webkit.org/show_bug.cgi?id=189819
+
+        Reviewed by Simon Fraser.
+
+        * css/CSSComputedStyleDeclaration.cpp:
+        (WebCore::ComputedStyleExtractor::customPropertyValue):
+        * css/CSSCustomPropertyValue.cpp:
+        (WebCore::CSSCustomPropertyValue::resolveVariableReferences const):
+        * css/CSSCustomPropertyValue.h:
+        * css/CSSRegisteredCustomProperty.h:
+        * css/CSSVariableData.cpp:
+        (WebCore::CSSVariableData::resolveVariableFallback const):
+        (WebCore::CSSVariableData::resolveVariableReference const):
+        (WebCore::CSSVariableData::resolveVariableReferences const):
+        (WebCore::CSSVariableData::resolveTokenRange const):
+        * css/CSSVariableData.h:
+        * css/DOMCSSRegisterCustomProperty.cpp:
+        (WebCore::DOMCSSRegisterCustomProperty::registerProperty):
+        * css/DOMCSSRegisterCustomProperty.h:
+        * css/DOMCSSRegisterCustomProperty.idl:
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::resolvedVariableValue):
+        (WebCore::StyleResolver::applyCascadedProperties):
+        * css/parser/CSSParser.cpp:
+        (WebCore::CSSParser::parseValueWithVariableReferences):
+        * css/parser/CSSParser.h:
+        * dom/Document.h:
+        (WebCore::Document::getCSSRegisteredCustomPropertySet const):
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::checkVariablesInCustomProperties):
+        * rendering/style/RenderStyle.h:
+
 2018-09-21  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

@@ -2625 +2625 @@
         return nullptr;
 
-    return style->customProperties().get(propertyName);
+    auto* value = style->customProperties().get(propertyName);
+    if (value)
+        return value;
+
+    auto* registered = styledElement->document().getCSSRegisteredCustomPropertySet().get(propertyName);
+    if (registered && registered->initialValue)
+        return registered->initialValue;
+
+    return nullptr;
 }
 

trunk/Source/WebCore/css/CSSCustomPropertyValue.cpp

@@ -38 +38 @@
 }
 
-void CSSCustomPropertyValue::resolveVariableReferences(const CustomPropertyValueMap& customProperties, Vector<Ref<CSSCustomPropertyValue>>& resolvedValues) const
+void CSSCustomPropertyValue::resolveVariableReferences(const CustomPropertyValueMap& customProperties, const CSSRegisteredCustomPropertySet& registeredProperties, Vector<Ref<CSSCustomPropertyValue>>& resolvedValues) const
 {
     ASSERT(containsVariables());
@@ -45 +45 @@
     
     ASSERT(m_value->needsVariableResolution());
-    RefPtr<CSSVariableData> resolvedData = m_value->resolveVariableReferences(customProperties);
+    RefPtr<CSSVariableData> resolvedData = m_value->resolveVariableReferences(customProperties, registeredProperties);
     if (resolvedData)
         resolvedValues.append(CSSCustomPropertyValue::createWithVariableData(m_name, resolvedData.releaseNonNull()));

trunk/Source/WebCore/css/CSSCustomPropertyValue.h

@@ -26 +26 @@
 #pragma once
 
+#include "CSSRegisteredCustomProperty.h"
 #include "CSSValue.h"
 #include "CSSVariableData.h"
@@ -71 +72 @@
     bool checkVariablesForCycles(const AtomicString& name, CustomPropertyValueMap&, HashSet<AtomicString>& seenProperties, HashSet<AtomicString>& invalidProperties) const;
 
-    void resolveVariableReferences(const CustomPropertyValueMap&, Vector<Ref<CSSCustomPropertyValue>>&) const;
+    void resolveVariableReferences(const CustomPropertyValueMap&, const CSSRegisteredCustomPropertySet&, Vector<Ref<CSSCustomPropertyValue>>&) const;
 
     CSSValueID valueID() const { return m_valueId; }

trunk/Source/WebCore/css/CSSRegisteredCustomProperty.h

@@ -30 +30 @@
 namespace WebCore {
 
+class CSSCustomPropertyValue;
+
 struct CSSRegisteredCustomProperty {
     const String name;
-    /* TODO syntax, inherits, initialValue */
+    /* TODO syntax, inherits */
+    const RefPtr<CSSCustomPropertyValue> initialValue;
 };
 
+using CSSRegisteredCustomPropertySet = HashMap<String, std::unique_ptr<CSSRegisteredCustomProperty>>;
+
 }

trunk/Source/WebCore/css/CSSVariableData.cpp

@@ -126 +126 @@
 }
 
-bool CSSVariableData::resolveVariableFallback(const CustomPropertyValueMap& customProperties, CSSParserTokenRange range, Vector<CSSParserToken>& result) const
+bool CSSVariableData::resolveVariableFallback(const CustomPropertyValueMap& customProperties, const CSSRegisteredCustomPropertySet& registeredProperties, CSSParserTokenRange range, Vector<CSSParserToken>& result) const
 {
     if (range.atEnd())
@@ -132 +132 @@
     ASSERT(range.peek().type() == CommaToken);
     range.consume();
-    return resolveTokenRange(customProperties, range, result);
+    return resolveTokenRange(customProperties, registeredProperties, range, result);
 }
-    
-bool CSSVariableData::resolveVariableReference(const CustomPropertyValueMap& customProperties, CSSParserTokenRange range, Vector<CSSParserToken>& result) const
+
+bool CSSVariableData::resolveVariableReference(const CustomPropertyValueMap& customProperties, const CSSRegisteredCustomPropertySet& registeredProperties, CSSParserTokenRange range, Vector<CSSParserToken>& result) const
 {
     range.consumeWhitespace();
@@ -143 +143 @@
     
     RefPtr<CSSCustomPropertyValue> property = customProperties.get(variableName);
-    if (!property || !property->value())
-        return resolveVariableFallback(customProperties, range, result);
+    if (!property || !property->value()) {
+        auto* registered = registeredProperties.get(variableName);
+        if (registered && registered->initialValue)
+            property = registered->initialValue;
+        else
+            return resolveVariableFallback(customProperties, registeredProperties, range, result);
+    }
+    ASSERT(property);
     
     if (property->containsVariables()) {
         // FIXME: Avoid doing this work more than once.
-        RefPtr<CSSVariableData> resolvedData = property->value()->resolveVariableReferences(customProperties);
+        RefPtr<CSSVariableData> resolvedData = property->value()->resolveVariableReferences(customProperties, registeredProperties);
         if (!resolvedData)
             return false;
@@ -158 +164 @@
 }
 
-RefPtr<CSSVariableData> CSSVariableData::resolveVariableReferences(const CustomPropertyValueMap& customProperties) const
+RefPtr<CSSVariableData> CSSVariableData::resolveVariableReferences(const CustomPropertyValueMap& customProperties, const CSSRegisteredCustomPropertySet& registeredProperties) const
 {
     Vector<CSSParserToken> resolvedTokens;
     CSSParserTokenRange range = m_tokens;
-    if (!resolveTokenRange(customProperties, range, resolvedTokens))
+    if (!resolveTokenRange(customProperties, registeredProperties, range, resolvedTokens))
         return nullptr;
     return CSSVariableData::createResolved(resolvedTokens, *this);
 }
     
-bool CSSVariableData::resolveTokenRange(const CustomPropertyValueMap& customProperties, CSSParserTokenRange range, Vector<CSSParserToken>& result) const
+bool CSSVariableData::resolveTokenRange(const CustomPropertyValueMap& customProperties, const CSSRegisteredCustomPropertySet& registeredProperties, CSSParserTokenRange range, Vector<CSSParserToken>& result) const
 {
     bool success = true;
     while (!range.atEnd()) {
         if (range.peek().functionId() == CSSValueVar || range.peek().functionId() == CSSValueEnv)
-            success &= resolveVariableReference(customProperties, range.consumeBlock(), result);
+            success &= resolveVariableReference(customProperties, registeredProperties, range.consumeBlock(), result);
         else
             result.append(range.consume());

trunk/Source/WebCore/css/CSSVariableData.h

@@ -32 +32 @@
 #include "CSSParserToken.h"
 #include "CSSParserTokenRange.h"
+#include "CSSRegisteredCustomProperty.h"
 #include <wtf/HashSet.h>
 #include <wtf/text/WTFString.h>
@@ -63 +64 @@
     bool checkVariablesForCycles(const AtomicString& name, CustomPropertyValueMap&, HashSet<AtomicString>& seenProperties, HashSet<AtomicString>& invalidProperties) const;
 
-    RefPtr<CSSVariableData> resolveVariableReferences(const CustomPropertyValueMap& customProperties) const;
-    bool resolveTokenRange(const CustomPropertyValueMap&, CSSParserTokenRange, Vector<CSSParserToken>&) const;
+    RefPtr<CSSVariableData> resolveVariableReferences(const CustomPropertyValueMap& customProperties, const CSSRegisteredCustomPropertySet&) const;
+    bool resolveTokenRange(const CustomPropertyValueMap&, const CSSRegisteredCustomPropertySet&, CSSParserTokenRange, Vector<CSSParserToken>&) const;
 
 private:
@@ -83 +84 @@
     
     bool checkVariablesForCyclesWithRange(CSSParserTokenRange, CustomPropertyValueMap&, HashSet<AtomicString>& seenProperties, HashSet<AtomicString>& invalidProperties) const;
-    bool resolveVariableReference(const CustomPropertyValueMap&, CSSParserTokenRange, Vector<CSSParserToken>&) const;
-    bool resolveVariableFallback(const CustomPropertyValueMap&, CSSParserTokenRange, Vector<CSSParserToken>&) const;
+    bool resolveVariableReference(const CustomPropertyValueMap&, const CSSRegisteredCustomPropertySet&, CSSParserTokenRange, Vector<CSSParserToken>&) const;
+    bool resolveVariableFallback(const CustomPropertyValueMap&, const CSSRegisteredCustomPropertySet&, CSSParserTokenRange, Vector<CSSParserToken>&) const;
 
     String m_backingString;

trunk/Source/WebCore/css/DOMCSSRegisterCustomProperty.cpp

@@ -27 +27 @@
 #include "DOMCSSRegisterCustomProperty.h"
 
+#include "CSSCustomPropertyValue.h"
 #include "CSSRegisteredCustomProperty.h"
+#include "CSSTokenizer.h"
 #include "DOMCSSNamespace.h"
 #include "Document.h"
@@ -34 +36 @@
 namespace WebCore {
 
-void DOMCSSRegisterCustomProperty::registerProperty(Document& document, const DOMCSSCustomPropertyDescriptor& descriptor)
+ExceptionOr<void> DOMCSSRegisterCustomProperty::registerProperty(Document& document, const DOMCSSCustomPropertyDescriptor& descriptor)
 {
-    CSSRegisteredCustomProperty property { descriptor.name };
-    if (!document.registerCSSProperty(WTFMove(property))) {
-        /* TODO throw JS exception */
-        return;
-    }
+    CSSTokenizer tokenizer(descriptor.initialValue);
+    RefPtr<CSSCustomPropertyValue> initialValue;
+    if (!tokenizer.tokenRange().atEnd())
+        initialValue = CSSCustomPropertyValue::createWithVariableData(descriptor.name, CSSVariableData::create(tokenizer.tokenRange(), false));
+
+    CSSRegisteredCustomProperty property { descriptor.name, WTFMove(initialValue) };
+    if (!document.registerCSSProperty(WTFMove(property)))
+        return Exception { InvalidModificationError, "This property has already been registered." };
+
+    return { };
 }
 

trunk/Source/WebCore/css/DOMCSSRegisterCustomProperty.h

@@ -27 +27 @@
 
 #include "DOMCSSCustomPropertyDescriptor.h"
+#include "ExceptionOr.h"
 #include "Supplementable.h"
 
@@ -38 +39 @@
     explicit DOMCSSRegisterCustomProperty(DOMCSSNamespace&) { }
 
-    static void registerProperty(Document&, const DOMCSSCustomPropertyDescriptor&);
+    static ExceptionOr<void> registerProperty(Document&, const DOMCSSCustomPropertyDescriptor&);
 
 private:

trunk/Source/WebCore/css/DOMCSSRegisterCustomProperty.idl

@@ -27 +27 @@
     EnabledAtRuntime=CSSCustomPropertiesAndValues
 ] partial interface DOMCSSNamespace {
-    [CallWith=Document] static void registerProperty(DOMCSSCustomPropertyDescriptor descriptor);
+    [CallWith=Document, MayThrowException] static void registerProperty(DOMCSSCustomPropertyDescriptor descriptor);
 };

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -1709 +1709 @@
 {
     CSSParser parser(document());
-    return parser.parseValueWithVariableReferences(propID, value, m_state.style()->customProperties(), m_state.style()->direction(), m_state.style()->writingMode());
+    return parser.parseValueWithVariableReferences(propID, value, m_state.style()->customProperties(), document().getCSSRegisteredCustomPropertySet(), m_state.style()->direction(), m_state.style()->writingMode());
 }
 
@@ -2286 +2286 @@
 
     if (firstProperty == CSSPropertyCustom)
-        m_state.style()->checkVariablesInCustomProperties();
+        m_state.style()->checkVariablesInCustomProperties(document().getCSSRegisteredCustomPropertySet());
 }
 

trunk/Source/WebCore/css/parser/CSSParser.cpp

@@ -176 +176 @@
 }
 
-RefPtr<CSSValue> CSSParser::parseValueWithVariableReferences(CSSPropertyID propID, const CSSValue& value, const CustomPropertyValueMap& customProperties, TextDirection direction, WritingMode writingMode)
+RefPtr<CSSValue> CSSParser::parseValueWithVariableReferences(CSSPropertyID propID, const CSSValue& value, const CustomPropertyValueMap& customProperties, const CSSRegisteredCustomPropertySet& registeredProperties, TextDirection direction, WritingMode writingMode)
 {
     if (value.isPendingSubstitutionValue()) {
@@ -190 +190 @@
         
         Vector<CSSParserToken> resolvedTokens;
-        if (!variableData->resolveTokenRange(customProperties, variableData->tokens(), resolvedTokens))
+        if (!variableData->resolveTokenRange(customProperties, registeredProperties, variableData->tokens(), resolvedTokens))
             return nullptr;
         
@@ -211 +211 @@
         
         Vector<CSSParserToken> resolvedTokens;
-        if (!variableData->resolveTokenRange(customProperties, variableData->tokens(), resolvedTokens))
+        if (!variableData->resolveTokenRange(customProperties, registeredProperties, variableData->tokens(), resolvedTokens))
             return nullptr;
         

trunk/Source/WebCore/css/parser/CSSParser.h

@@ -24 +24 @@
 
 #include "CSSParserContext.h"
+#include "CSSRegisteredCustomProperty.h"
 #include "CSSValue.h"
 #include "WritingMode.h"
@@ -76 +77 @@
     void parseSelector(const String&, CSSSelectorList&);
 
-    RefPtr<CSSValue> parseValueWithVariableReferences(CSSPropertyID, const CSSValue&, const CustomPropertyValueMap& customProperties, TextDirection, WritingMode);
+    RefPtr<CSSValue> parseValueWithVariableReferences(CSSPropertyID, const CSSValue&, const CustomPropertyValueMap&, const CSSRegisteredCustomPropertySet&, TextDirection, WritingMode);
 
     static Color parseColor(const String&, bool strict = false);

trunk/Source/WebCore/dom/Document.h

@@ -1493 +1493 @@
     bool hasMainArticleElement() const { return !!m_mainArticleElement; }
 
+    const CSSRegisteredCustomPropertySet& getCSSRegisteredCustomPropertySet() const { return m_CSSRegisteredPropertySet; }
     bool registerCSSProperty(CSSRegisteredCustomProperty&&);
 
@@ -2027 +2028 @@
     std::unique_ptr<UserGestureIndicator> m_temporaryUserGesture;
 
-    HashMap<String, std::unique_ptr<CSSRegisteredCustomProperty>> m_CSSRegisteredPropertySet;
+    CSSRegisteredCustomPropertySet m_CSSRegisteredPropertySet;
 
     bool m_isRunningUserScripts { false };

trunk/Source/WebCore/rendering/style/RenderStyle.cpp

@@ -2243 +2243 @@
 }
 
-void RenderStyle::checkVariablesInCustomProperties()
+void RenderStyle::checkVariablesInCustomProperties(const CSSRegisteredCustomPropertySet& registeredProperties)
 {
     if (!m_rareInheritedData->customProperties->containsVariables)
@@ -2274 +2274 @@
         if (!entry.value->containsVariables())
             continue;
-        entry.value->resolveVariableReferences(customProperties, resolvedValues);
+        entry.value->resolveVariableReferences(customProperties, registeredProperties, resolvedValues);
     }
     

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -793 +793 @@
 #endif
 
-    void checkVariablesInCustomProperties();
+    void checkVariablesInCustomProperties(const CSSRegisteredCustomPropertySet&);
 
 // attribute setter methods