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

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

Issue 1537523003: Add correct equality testing for ComputedStyle's StyleVariableData (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "config.h" 5 #include "config.h"
6 #include "core/css/CSSVariableData.h" 6 #include "core/css/CSSVariableData.h"
7 7
8 #include "core/css/parser/CSSParserTokenRange.h" 8 #include "core/css/parser/CSSParserTokenRange.h"
9 #include "wtf/text/StringBuilder.h" 9 #include "wtf/text/StringBuilder.h"
10 10
11 namespace blink { 11 namespace blink {
12 12
13 template<typename CharacterType> void CSSVariableData::updateTokens(const CSSPar serTokenRange& range) 13 template<typename CharacterType> void CSSVariableData::updateTokens(const CSSPar serTokenRange& range)
14 { 14 {
15 const CharacterType* currentOffset = m_backingString.getCharacters<Character Type>(); 15 const CharacterType* currentOffset = m_backingString.getCharacters<Character Type>();
16 for (const CSSParserToken& token : range) { 16 for (const CSSParserToken& token : range) {
17 if (token.hasStringBacking()) { 17 if (token.hasStringBacking()) {
18 unsigned length = token.value().length(); 18 unsigned length = token.value().length();
19 CSSParserString parserString; 19 CSSParserString parserString;
20 parserString.init(currentOffset, length); 20 parserString.init(currentOffset, length);
21 m_tokens.append(token.copyWithUpdatedString(parserString)); 21 m_tokens.append(token.copyWithUpdatedString(parserString));
22 currentOffset += length; 22 currentOffset += length;
23 } else { 23 } else {
24 m_tokens.append(token); 24 m_tokens.append(token);
25 } 25 }
26 } 26 }
27 ASSERT(currentOffset == m_backingString.getCharacters<CharacterType>() + m_b ackingString.length()); 27 ASSERT(currentOffset == m_backingString.getCharacters<CharacterType>() + m_b ackingString.length());
28 } 28 }
29 29
30 bool CSSVariableData::operator==(const CSSVariableData& other) const
31 {
32 return tokens() == other.tokens();
33 }
34
30 void CSSVariableData::consumeAndUpdateTokens(const CSSParserTokenRange& range) 35 void CSSVariableData::consumeAndUpdateTokens(const CSSParserTokenRange& range)
31 { 36 {
32 StringBuilder stringBuilder; 37 StringBuilder stringBuilder;
33 CSSParserTokenRange localRange = range; 38 CSSParserTokenRange localRange = range;
34 39
35 while (!localRange.atEnd()) { 40 while (!localRange.atEnd()) {
36 CSSParserToken token = localRange.consume(); 41 CSSParserToken token = localRange.consume();
37 if (token.hasStringBacking()) { 42 if (token.hasStringBacking()) {
38 CSSParserString value = token.value(); 43 CSSParserString value = token.value();
39 if (value.is8Bit()) 44 if (value.is8Bit())
(...skipping 10 matching lines...) Expand all
50 } 55 }
51 56
52 CSSVariableData::CSSVariableData(const CSSParserTokenRange& range, bool needsVar iableResolution) 57 CSSVariableData::CSSVariableData(const CSSParserTokenRange& range, bool needsVar iableResolution)
53 : m_needsVariableResolution(needsVariableResolution) 58 : m_needsVariableResolution(needsVariableResolution)
54 { 59 {
55 ASSERT(!range.atEnd()); 60 ASSERT(!range.atEnd());
56 consumeAndUpdateTokens(range); 61 consumeAndUpdateTokens(range);
57 } 62 }
58 63
59 } // namespace blink 64 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSVariableData.h ('k') | third_party/WebKit/Source/core/css/parser/CSSParserToken.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698