[Typed-OM] Get CSSTokenStreamValue from StyleMap

third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValue.cpp

Index: third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValue.cpp
diff --git a/third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValue.cpp b/third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValue.cpp
index fdb62cc2379dda0c5debdeedf8735653af398397..282264de6fe8788a50e987df321a3009b299e619 100644
--- a/third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValue.cpp
+++ b/third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValue.cpp
@@ -4,7 +4,6 @@
 
 #include "core/css/cssom/CSSTokenStreamValue.h"
 
-#include "core/css/CSSVariableReferenceValue.h"
 #include "core/css/cssom/CSSStyleVariableReferenceValue.h"
 #include "core/css/parser/CSSTokenizer.h"
 #include "wtf/text/StringBuilder.h"
@@ -38,6 +37,49 @@ private:
     const Member<CSSTokenStreamValue> m_tokenStreamValue;
 };
 
+CSSTokenStreamValue* fragmentsToTokenStreamValue(const HeapVector<StringOrCSSVariableReferenceValue>& fragments)

[anthonyhkf, 2016/08/25 03:48:31]

Should this be moved to the parserTokenRangeToFragments()? So it will become
parserTokenRangeToTokenStreamValue() and return the CSSTokenStreamValue from the
HeapVector (just move this function's body to the end of current
parserTokenRangeToFragments()).

+{
+    // returns undefined/null if there is no value following the variable's name
+    if (fragments.size() == 0)
+        return nullptr;
+    return CSSTokenStreamValue::create(fragments);
+}
+
+StringView findVariableName(CSSParserTokenRange& range)
+{
+    range.consumeWhitespace();
+    return range.consume().value();
+}
+
+CSSStyleVariableReferenceValue* variableReferenceValue(StringView variableName, CSSTokenStreamValue* tokenStreamValue)
+{
+    return CSSStyleVariableReferenceValue::create(variableName.toString(), tokenStreamValue);
+}
+
+HeapVector<StringOrCSSVariableReferenceValue> parserTokenRangeToFragments(CSSParserTokenRange range)
+{
+    HeapVector<StringOrCSSVariableReferenceValue> fragments;
+    StringBuilder builder;
+    while (!range.atEnd()) {
+        if (range.peek().functionId() == CSSValueVar) {
+            if (!builder.isEmpty()) {
+                fragments.append(StringOrCSSVariableReferenceValue::fromString(builder.toString()));
+                builder.clear();
+            }
+            CSSParserTokenRange current = range.consumeBlock();
+            StringView variableName = findVariableName(current);
+            while (!current.atEnd() && current.consume().type() != CSSParserTokenType::CommaToken) { }
+            CSSTokenStreamValue* tokenStreamValue = fragmentsToTokenStreamValue(parserTokenRangeToFragments(current));
+            fragments.append(StringOrCSSVariableReferenceValue::fromCSSVariableReferenceValue(variableReferenceValue(variableName, tokenStreamValue)));
+        } else {
+            range.consume().serialize(builder);
+        }
+    }
+    if (!builder.isEmpty())
+        fragments.append(StringOrCSSVariableReferenceValue::fromString(builder.toString()));
+    return fragments;
+}
+
 } // namespace
 
 ValueIterable<StringOrCSSVariableReferenceValue>::IterationSource* CSSTokenStreamValue::startIteration(ScriptState*, ExceptionState&)
@@ -45,6 +87,11 @@ ValueIterable<StringOrCSSVariableReferenceValue>::IterationSource* CSSTokenStrea
     return new TokenStreamValueIterationSource(this);
 }
 
+CSSTokenStreamValue* CSSTokenStreamValue::fromCSSValue(const CSSVariableReferenceValue& cssVariableReferenceValue)
+{
+    return fragmentsToTokenStreamValue(parserTokenRangeToFragments(cssVariableReferenceValue.variableDataValue()->tokenRange()));
+}
+
 CSSValue* CSSTokenStreamValue::toCSSValue() const
 {
     StringBuilder tokens;