Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Unified Diff: third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValue.cpp

Issue 2140073002: [Typed-OM] Add compound type of CSSVariableReferenceValue and String with some tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@CSSTokenStreamValue
Patch Set: Rebase-update Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 13bdd6b4c6e017dac02b879f1ffa50a45d3150bb..fdb62cc2379dda0c5debdeedf8735653af398397 100644
--- a/third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValue.cpp
+++ b/third_party/WebKit/Source/core/css/cssom/CSSTokenStreamValue.cpp
@@ -5,6 +5,7 @@
#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"
@@ -23,7 +24,7 @@ public:
{
if (m_index >= m_tokenStreamValue->size())
return false;
- value.setString(m_tokenStreamValue->fragmentAtIndex(m_index));
+ value = m_tokenStreamValue->fragmentAtIndex(m_index);
return true;
}
@@ -51,7 +52,12 @@ CSSValue* CSSTokenStreamValue::toCSSValue() const
for (unsigned i = 0; i < m_fragments.size(); i++) {
if (i)
tokens.append("/**/");
- tokens.append(m_fragments[i]);
+ if (m_fragments[i].isString())
+ tokens.append(m_fragments[i].getAsString());
+ else if (m_fragments[i].isCSSVariableReferenceValue())
+ tokens.append(m_fragments[i].getAsCSSVariableReferenceValue()->variable());
+ else
+ NOTREACHED();
}
CSSTokenizer::Scope scope(tokens.toString());

Powered by Google App Engine
This is Rietveld 408576698