Compute registered properties after resolving high priority properties

third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.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 "core/css/resolver/CSSVariableResolver.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/CSSValueKeywords.h"
 #include "core/StyleBuilderFunctions.h"
 #include "core/StylePropertyShorthand.h"
@@ skipping 52 matching lines @@
   RefPtr<CSSVariableData> newVariableData =
       resolveCustomProperty(name, *variableData);
   if (!registration) {
     m_inheritedVariables->setVariable(name, newVariableData);
     return newVariableData.get();
   }
 
   const CSSValue* parsedValue = nullptr;
   if (newVariableData) {
     parsedValue = newVariableData->parseForSyntax(registration->syntax());
-    if (parsedValue)
-      parsedValue = &StyleBuilderConverter::convertRegisteredPropertyValue(
-          m_styleResolverState, *parsedValue);
-    else
+    if (!parsedValue)
       newVariableData = nullptr;
   }
   if (registration->inherits()) {
     m_inheritedVariables->setVariable(name, newVariableData);
     m_inheritedVariables->setRegisteredVariable(name, parsedValue);
   } else {
     m_nonInheritedVariables->setVariable(name, newVariableData);
     m_nonInheritedVariables->setRegisteredVariable(name, parsedValue);
   }
   if (!newVariableData)
@@ skipping 207 matching lines @@
   if (inheritedVariables) {
     for (auto& variable : inheritedVariables->m_data)
       resolver.valueForCustomProperty(variable.key);
   }
   if (nonInheritedVariables) {
     for (auto& variable : nonInheritedVariables->m_data)
       resolver.valueForCustomProperty(variable.key);
   }
 }
 
+void CSSVariableResolver::computeRegisteredVariables(
+    const StyleResolverState& state) {
+  // const_cast is needed because Persistent<const ...> doesn't work properly.
+
+  StyleInheritedVariables* inheritedVariables =
+      state.style()->inheritedVariables();
+  if (inheritedVariables) {
+    for (auto& variable : inheritedVariables->m_registeredData) {
+      if (variable.value) {
+        variable.value = const_cast<CSSValue*>(
+            &StyleBuilderConverter::convertRegisteredPropertyValue(
+                state, *variable.value));
+      }
+    }
+  }
+
+  StyleNonInheritedVariables* nonInheritedVariables =
+      state.style()->nonInheritedVariables();
+  if (nonInheritedVariables) {
+    for (auto& variable : nonInheritedVariables->m_registeredData) {
+      if (variable.value) {
+        variable.value = const_cast<CSSValue*>(
+            &StyleBuilderConverter::convertRegisteredPropertyValue(
+                state, *variable.value));
+      }
+    }
+  }
+}
+
 CSSVariableResolver::CSSVariableResolver(const StyleResolverState& state)
-    : m_styleResolverState(state),
-      m_inheritedVariables(state.style()->inheritedVariables()),
+    : m_inheritedVariables(state.style()->inheritedVariables()),
       m_nonInheritedVariables(state.style()->nonInheritedVariables()),
       m_registry(state.document().propertyRegistry()) {}
 
 DEFINE_TRACE(CSSVariableResolver) {
   visitor->trace(m_registry);
 }
 
 }  // namespace blink