[Typed-OM] Add compound type of CSSVariableReferenceValue and String with some tests

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

 // Copyright 2016 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/cssom/CSSTokenStreamValue.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/Iterable.h"
 #include "bindings/core/v8/ScriptWrappable.h"
 #include "core/CoreExport.h"
 #include "core/css/CSSCustomIdentValue.h"
 #include "core/css/CSSPrimitiveValue.h"
 #include "core/css/CSSValueList.h"
 #include "core/css/CSSVariableReferenceValue.h"
 #include "core/css/cssom/CSSStyleValue.h"
+#include "core/css/cssom/CSSStyleVariableReferenceValue.h"
 #include "core/css/parser/CSSPropertyParser.h"
 #include "core/css/parser/CSSTokenizer.h"
 #include "core/dom/ExceptionCode.h"
 #include "platform/heap/HeapAllocator.h"
 #include "wtf/text/StringBuilder.h"
 
 
 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* scriptState, String& value, ExceptionState& exceptionState) override
+    bool next(ScriptState* scriptState, StringOrCSSVariableReferenceValue& value, ExceptionState& exceptionState) override
     {
         if (m_index >= m_tokenStreamValue->size())
             return false;
         value = m_tokenStreamValue->referenceAtIndex(m_index);
         return true;
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
         visitor->trace(m_tokenStreamValue);
-        ValueIterable<String>::IterationSource::trace(visitor);
+        ValueIterable<StringOrCSSVariableReferenceValue>::IterationSource::trace(visitor);
     }
 
 private:
     const Member<CSSTokenStreamValue> m_tokenStreamValue;
 };
 
 } // namespace
 
-ValueIterable<String>::IterationSource* CSSTokenStreamValue::startIteration(ScriptState*, ExceptionState&)
+ValueIterable<StringOrCSSVariableReferenceValue>::IterationSource* CSSTokenStreamValue::startIteration(ScriptState*, ExceptionState&)
 {
     return new TokenStreamValueIterationSource(this);
 }
 
 CSSValue* CSSTokenStreamValue::toCSSValue() const
 {
     StringBuilder tokens;
 
-    for (unsigned i = 0; i < m_listOfReferences.size(); ++i) {
+    for (unsigned i = 0; i < m_listOfReferences.size(); i++) {
         if (i)
             tokens.append("/**/");
-        tokens.append(m_listOfReferences[i]);
+        if (m_listOfReferences[i].isString())
+            tokens.append(m_listOfReferences[i].getAsString());
+        else
+            tokens.append(m_listOfReferences[i].getAsCSSVariableReferenceValue()->variable());

[meade_UTC10, 2016/07/18 06:21:38]

Theoretically it could still be null, how about this?

if (m_listOfReferences[i].isString())
...
else if (m_listOfReferences[i].isCSSVariableReferenceValue())
...
else
  NOTREACHED();

     }
 
     CSSTokenizer::Scope scope(tokens.toString());
 
     return CSSVariableReferenceValue::create(CSSVariableData::create(scope.tokenRange()));
 }
 
 } // namespace blink