[Typed-OM] Add StringOrCSSVariableReferenceValue type

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 9331c5e7c87045d72786f81ef48157b42a656145..998ca7504177ace4dd3d59f9fa4f34b3adcb9f07 100644
--- a/third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValue.cpp
+++ b/third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValue.cpp
@@ -12,25 +12,27 @@ namespace blink {
 
 namespace {
 
-class TokenStreamValueIterationSource final : public ValueIterable<String>::IterationSource {
+class TokenStreamValueIterationSource final : public ValueIterable<StringOrCSSVariableReferenceValue>::IterationSource {
 public:
     explicit TokenStreamValueIterationSource(CSSTokenStreamValue* tokenStreamValue)
         : m_tokenStreamValue(tokenStreamValue)
     {
     }
 
-    bool next(ScriptState*, String& value, ExceptionState&) override
+    bool next(ScriptState*, StringOrCSSVariableReferenceValue& value, ExceptionState&) override
     {
         if (m_index >= m_tokenStreamValue->size())
             return false;
-        value = m_tokenStreamValue->fragmentAtIndex(m_index);
+        StringOrCSSVariableReferenceValue result;
+        result.setString(m_tokenStreamValue->fragmentAtIndex(m_index));
+        value = result;

[meade_UTC10, 2016/07/20 03:20:29]

Instead of the above three lines, you could just write

value.setString(m_tokenStreamValue->fragmentAtIndex(m_index));

         return true;
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_tokenStreamValue);
-        ValueIterable<String>::IterationSource::trace(visitor);
+        ValueIterable<StringOrCSSVariableReferenceValue>::IterationSource::trace(visitor);
     }
 
 private:
@@ -39,7 +41,7 @@ private:
 
 } // namespace
 
-ValueIterable<String>::IterationSource* CSSTokenStreamValue::startIteration(ScriptState*, ExceptionState&)
+ValueIterable<StringOrCSSVariableReferenceValue>::IterationSource* CSSTokenStreamValue::startIteration(ScriptState*, ExceptionState&)
 {
     return new TokenStreamValueIterationSource(this);
 }