Store custom property backing strings in resolved CSSVariableData objects.

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 "config.h"
 #include "core/css/resolver/CSSVariableResolver.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/CSSValueKeywords.h"
 #include "core/StyleBuilderFunctions.h"
@@ skipping 43 matching lines @@
         Vector<CSSParserToken> tokens;
         if (variableData->needsVariableResolution()) {
             m_variablesSeen.add(variableName);
             resolveVariableReferencesFromTokens(variableData->tokens(), result, context);
             m_variablesSeen.remove(variableName);
 
             // The old variable data holds onto the backing string the new resolved CSSVariableData
             // relies on. Ensure it will live beyond us overwriting the RefPtr in StyleVariableData.
             ASSERT(variableData->refCount() > 1);
 
-            m_styleVariableData->setVariable(variableName, CSSVariableData::createResolved(tokens));
+            m_styleVariableData->setVariable(variableName, CSSVariableData::createResolved(tokens, variableData));
             if (!context.cycleStartPoints.isEmpty()) {
                 if (context.cycleStartPoints.contains(variableName))
                     context.cycleStartPoints.remove(variableName);
 
                 if (!context.cycleStartPoints.isEmpty()) {
                     resolveFallback(range, trash, context);
                     return;
                 }
             }
         } else {
@@ skipping 61 matching lines @@
 
     for (auto& variable : variables->m_data) {
         if (!variable.value->needsVariableResolution())
             continue;
         Vector<CSSParserToken> resolvedTokens;
 
         CSSVariableResolver resolver(variables, variable.key);
         ResolutionState context;
         resolver.resolveVariableReferencesFromTokens(variable.value->tokens(), resolvedTokens, context);
 
-        variable.value = CSSVariableData::createResolved(resolvedTokens);
+        variable.value = CSSVariableData::createResolved(resolvedTokens, variable.value);
     }
 }
 
 CSSVariableResolver::CSSVariableResolver(StyleVariableData* styleVariableData)
     : m_styleVariableData(styleVariableData)
 {
 }
 
 CSSVariableResolver::CSSVariableResolver(StyleVariableData* styleVariableData, AtomicString& variable)
     : m_styleVariableData(styleVariableData)
 {
     m_variablesSeen.add(variable);
 }
 
 } // namespace blink