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

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

Issue 2251663002: [Typed-OM] Get CSSTokenStreamValue from StyleMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and change parsing Created 4 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/css/cssom/CSSTokenStreamValue.h" 5 #include "core/css/cssom/CSSTokenStreamValue.h"
6 6
7 #include "core/css/CSSVariableReferenceValue.h"
8 #include "core/css/cssom/CSSStyleVariableReferenceValue.h" 7 #include "core/css/cssom/CSSStyleVariableReferenceValue.h"
9 #include "core/css/parser/CSSTokenizer.h" 8 #include "core/css/parser/CSSTokenizer.h"
10 #include "wtf/text/StringBuilder.h" 9 #include "wtf/text/StringBuilder.h"
11 10
12 namespace blink { 11 namespace blink {
13 12
14 namespace { 13 namespace {
15 14
16 class TokenStreamValueIterationSource final : public ValueIterable<StringOrCSSVa riableReferenceValue>::IterationSource { 15 class TokenStreamValueIterationSource final : public ValueIterable<StringOrCSSVa riableReferenceValue>::IterationSource {
17 public: 16 public:
(...skipping 13 matching lines...) Expand all
31 DEFINE_INLINE_VIRTUAL_TRACE() 30 DEFINE_INLINE_VIRTUAL_TRACE()
32 { 31 {
33 visitor->trace(m_tokenStreamValue); 32 visitor->trace(m_tokenStreamValue);
34 ValueIterable<StringOrCSSVariableReferenceValue>::IterationSource::trace (visitor); 33 ValueIterable<StringOrCSSVariableReferenceValue>::IterationSource::trace (visitor);
35 } 34 }
36 35
37 private: 36 private:
38 const Member<CSSTokenStreamValue> m_tokenStreamValue; 37 const Member<CSSTokenStreamValue> m_tokenStreamValue;
39 }; 38 };
40 39
40 CSSTokenStreamValue* fragmentsToTokenStreamValue(const HeapVector<StringOrCSSVar iableReferenceValue>& fragments)
anthonyhkf 2016/08/25 03:48:31 Should this be moved to the parserTokenRangeToFrag
41 {
42 // returns undefined/null if there is no value following the variable's name
43 if (fragments.size() == 0)
44 return nullptr;
45 return CSSTokenStreamValue::create(fragments);
46 }
47
48 StringView findVariableName(CSSParserTokenRange& range)
49 {
50 range.consumeWhitespace();
51 return range.consume().value();
52 }
53
54 CSSStyleVariableReferenceValue* variableReferenceValue(StringView variableName, CSSTokenStreamValue* tokenStreamValue)
55 {
56 return CSSStyleVariableReferenceValue::create(variableName.toString(), token StreamValue);
57 }
58
59 HeapVector<StringOrCSSVariableReferenceValue> parserTokenRangeToFragments(CSSPar serTokenRange range)
60 {
61 HeapVector<StringOrCSSVariableReferenceValue> fragments;
62 StringBuilder builder;
63 while (!range.atEnd()) {
64 if (range.peek().functionId() == CSSValueVar) {
65 if (!builder.isEmpty()) {
66 fragments.append(StringOrCSSVariableReferenceValue::fromString(b uilder.toString()));
67 builder.clear();
68 }
69 CSSParserTokenRange current = range.consumeBlock();
70 StringView variableName = findVariableName(current);
71 while (!current.atEnd() && current.consume().type() != CSSParserToke nType::CommaToken) { }
72 CSSTokenStreamValue* tokenStreamValue = fragmentsToTokenStreamValue( parserTokenRangeToFragments(current));
73 fragments.append(StringOrCSSVariableReferenceValue::fromCSSVariableR eferenceValue(variableReferenceValue(variableName, tokenStreamValue)));
74 } else {
75 range.consume().serialize(builder);
76 }
77 }
78 if (!builder.isEmpty())
79 fragments.append(StringOrCSSVariableReferenceValue::fromString(builder.t oString()));
80 return fragments;
81 }
82
41 } // namespace 83 } // namespace
42 84
43 ValueIterable<StringOrCSSVariableReferenceValue>::IterationSource* CSSTokenStrea mValue::startIteration(ScriptState*, ExceptionState&) 85 ValueIterable<StringOrCSSVariableReferenceValue>::IterationSource* CSSTokenStrea mValue::startIteration(ScriptState*, ExceptionState&)
44 { 86 {
45 return new TokenStreamValueIterationSource(this); 87 return new TokenStreamValueIterationSource(this);
46 } 88 }
47 89
90 CSSTokenStreamValue* CSSTokenStreamValue::fromCSSValue(const CSSVariableReferenc eValue& cssVariableReferenceValue)
91 {
92 return fragmentsToTokenStreamValue(parserTokenRangeToFragments(cssVariableRe ferenceValue.variableDataValue()->tokenRange()));
93 }
94
48 CSSValue* CSSTokenStreamValue::toCSSValue() const 95 CSSValue* CSSTokenStreamValue::toCSSValue() const
49 { 96 {
50 StringBuilder tokens; 97 StringBuilder tokens;
51 98
52 for (unsigned i = 0; i < m_fragments.size(); i++) { 99 for (unsigned i = 0; i < m_fragments.size(); i++) {
53 if (i) 100 if (i)
54 tokens.append("/**/"); 101 tokens.append("/**/");
55 if (m_fragments[i].isString()) 102 if (m_fragments[i].isString())
56 tokens.append(m_fragments[i].getAsString()); 103 tokens.append(m_fragments[i].getAsString());
57 else if (m_fragments[i].isCSSVariableReferenceValue()) 104 else if (m_fragments[i].isCSSVariableReferenceValue())
58 tokens.append(m_fragments[i].getAsCSSVariableReferenceValue()->varia ble()); 105 tokens.append(m_fragments[i].getAsCSSVariableReferenceValue()->varia ble());
59 else 106 else
60 NOTREACHED(); 107 NOTREACHED();
61 } 108 }
62 109
63 CSSTokenizer::Scope scope(tokens.toString()); 110 CSSTokenizer::Scope scope(tokens.toString());
64 111
65 return CSSVariableReferenceValue::create(CSSVariableData::create(scope.token Range())); 112 return CSSVariableReferenceValue::create(CSSVariableData::create(scope.token Range()));
66 } 113 }
67 114
68 } // namespace blink 115 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698