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

Side by Side Diff: Source/core/css/parser/CSSParserImpl.cpp

Issue 1192983003: CSS Custom Properties (Variables) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/parser/CSSParserImpl.h" 6 #include "core/css/parser/CSSParserImpl.h"
7 7
8 #include "core/css/CSSKeyframesRule.h" 8 #include "core/css/CSSKeyframesRule.h"
9 #include "core/css/CSSStyleSheet.h" 9 #include "core/css/CSSStyleSheet.h"
10 #include "core/css/CSSVariableValue.h"
10 #include "core/css/StylePropertySet.h" 11 #include "core/css/StylePropertySet.h"
11 #include "core/css/StyleRuleImport.h" 12 #include "core/css/StyleRuleImport.h"
12 #include "core/css/StyleRuleKeyframe.h" 13 #include "core/css/StyleRuleKeyframe.h"
13 #include "core/css/StyleRuleNamespace.h" 14 #include "core/css/StyleRuleNamespace.h"
14 #include "core/css/StyleSheetContents.h" 15 #include "core/css/StyleSheetContents.h"
15 #include "core/css/parser/CSSParserObserver.h" 16 #include "core/css/parser/CSSParserObserver.h"
16 #include "core/css/parser/CSSParserObserverWrapper.h" 17 #include "core/css/parser/CSSParserObserverWrapper.h"
17 #include "core/css/parser/CSSParserValues.h" 18 #include "core/css/parser/CSSParserValues.h"
18 #include "core/css/parser/CSSPropertyParser.h" 19 #include "core/css/parser/CSSPropertyParser.h"
19 #include "core/css/parser/CSSSelectorParser.h" 20 #include "core/css/parser/CSSSelectorParser.h"
20 #include "core/css/parser/CSSSupportsParser.h" 21 #include "core/css/parser/CSSSupportsParser.h"
21 #include "core/css/parser/CSSTokenizer.h" 22 #include "core/css/parser/CSSTokenizer.h"
23 #include "core/css/parser/CSSVariableParser.h"
22 #include "core/css/parser/MediaQueryParser.h" 24 #include "core/css/parser/MediaQueryParser.h"
23 #include "core/dom/Document.h" 25 #include "core/dom/Document.h"
24 #include "core/dom/Element.h" 26 #include "core/dom/Element.h"
25 #include "core/frame/UseCounter.h" 27 #include "core/frame/UseCounter.h"
26 #include "platform/TraceEvent.h" 28 #include "platform/TraceEvent.h"
27 #include "wtf/BitArray.h" 29 #include "wtf/BitArray.h"
28 30
29 namespace blink { 31 namespace blink {
30 32
31 CSSParserImpl::CSSParserImpl(const CSSParserContext& context, StyleSheetContents * styleSheet) 33 CSSParserImpl::CSSParserImpl(const CSSParserContext& context, StyleSheetContents * styleSheet)
32 : m_context(context) 34 : m_context(context)
33 , m_defaultNamespace(starAtom) 35 , m_defaultNamespace(starAtom)
34 , m_styleSheet(styleSheet) 36 , m_styleSheet(styleSheet)
35 , m_observerWrapper(nullptr) 37 , m_observerWrapper(nullptr)
36 { 38 {
37 } 39 }
38 40
39 bool CSSParserImpl::parseValue(MutableStylePropertySet* declaration, CSSProperty ID unresolvedProperty, const String& string, bool important, const CSSParserCont ext& context) 41 bool CSSParserImpl::parseValue(MutableStylePropertySet* declaration, CSSProperty ID unresolvedProperty, const String& string, bool important, const CSSParserCont ext& context)
40 { 42 {
41 CSSParserImpl parser(context); 43 CSSParserImpl parser(context);
42 StyleRule::Type ruleType = StyleRule::Style; 44 StyleRule::Type ruleType = StyleRule::Style;
43 if (declaration->cssParserMode() == CSSViewportRuleMode) 45 if (declaration->cssParserMode() == CSSViewportRuleMode)
44 ruleType = StyleRule::Viewport; 46 ruleType = StyleRule::Viewport;
45 CSSTokenizer::Scope scope(string); 47 CSSTokenizerScope scope(string);
46 parser.consumeDeclarationValue(scope.tokenRange(), unresolvedProperty, impor tant, ruleType); 48 parser.consumeDeclarationValue(scope.tokenRange(), unresolvedProperty, impor tant, ruleType);
47 if (parser.m_parsedProperties.isEmpty()) 49 if (parser.m_parsedProperties.isEmpty())
48 return false; 50 return false;
49 return declaration->addParsedProperties(parser.m_parsedProperties); 51 return declaration->addParsedProperties(parser.m_parsedProperties);
50 } 52 }
51 53
52 static inline void filterProperties(bool important, const WillBeHeapVector<CSSPr operty, 256>& input, WillBeHeapVector<CSSProperty, 256>& output, size_t& unusedE ntries, BitArray<numCSSProperties>& seenProperties) 54 static inline void filterProperties(bool important, const WillBeHeapVector<CSSPr operty, 256>& input, WillBeHeapVector<CSSProperty, 256>& output, size_t& unusedE ntries, BitArray<numCSSProperties>& seenProperties)
53 { 55 {
54 // Add properties in reverse order so that highest priority definitions are reached first. Duplicate definitions can then be ignored when found. 56 // Add properties in reverse order so that highest priority definitions are reached first. Duplicate definitions can then be ignored when found.
55 for (size_t i = input.size(); i--; ) { 57 for (size_t i = input.size(); i--; ) {
56 const CSSProperty& property = input[i]; 58 const CSSProperty& property = input[i];
57 if (property.isImportant() != important) 59 if (property.isImportant() != important)
58 continue; 60 continue;
59 const unsigned propertyIDIndex = property.id() - firstCSSProperty; 61 const unsigned propertyIDIndex = property.id() - firstCSSProperty;
60 if (seenProperties.get(propertyIDIndex)) 62 if (seenProperties.get(propertyIDIndex) && property.id() != CSSPropertyV ariable)
61 continue; 63 continue;
62 seenProperties.set(propertyIDIndex); 64 seenProperties.set(propertyIDIndex);
63 output[--unusedEntries] = property; 65 output[--unusedEntries] = property;
64 } 66 }
65 } 67 }
66 68
67 static PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> createStylePropertySet( WillBeHeapVector<CSSProperty, 256>& parsedProperties, CSSParserMode mode) 69 static PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> createStylePropertySet( WillBeHeapVector<CSSProperty, 256>& parsedProperties, CSSParserMode mode)
68 { 70 {
69 BitArray<numCSSProperties> seenProperties; 71 BitArray<numCSSProperties> seenProperties;
70 size_t unusedEntries = parsedProperties.size(); 72 size_t unusedEntries = parsedProperties.size();
71 WillBeHeapVector<CSSProperty, 256> results(unusedEntries); 73 WillBeHeapVector<CSSProperty, 256> results(unusedEntries);
72 74
73 filterProperties(true, parsedProperties, results, unusedEntries, seenPropert ies); 75 filterProperties(true, parsedProperties, results, unusedEntries, seenPropert ies);
74 filterProperties(false, parsedProperties, results, unusedEntries, seenProper ties); 76 filterProperties(false, parsedProperties, results, unusedEntries, seenProper ties);
75 77
76 RefPtrWillBeRawPtr<ImmutableStylePropertySet> result = ImmutableStylePropert ySet::create(results.data() + unusedEntries, results.size() - unusedEntries, mod e); 78 RefPtrWillBeRawPtr<ImmutableStylePropertySet> result = ImmutableStylePropert ySet::create(results.data() + unusedEntries, results.size() - unusedEntries, mod e);
77 parsedProperties.clear(); 79 parsedProperties.clear();
78 return result.release(); 80 return result.release();
79 } 81 }
80 82
81 PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> CSSParserImpl::parseInlineStyl eDeclaration(const String& string, Element* element) 83 PassRefPtrWillBeRawPtr<ImmutableStylePropertySet> CSSParserImpl::parseInlineStyl eDeclaration(const String& string, Element* element)
82 { 84 {
83 Document& document = element->document(); 85 Document& document = element->document();
84 CSSParserContext context = CSSParserContext(document.elementSheet().contents ()->parserContext(), UseCounter::getFrom(&document)); 86 CSSParserContext context = CSSParserContext(document.elementSheet().contents ()->parserContext(), UseCounter::getFrom(&document));
85 CSSParserMode mode = element->isHTMLElement() && !document.inQuirksMode() ? HTMLStandardMode : HTMLQuirksMode; 87 CSSParserMode mode = element->isHTMLElement() && !document.inQuirksMode() ? HTMLStandardMode : HTMLQuirksMode;
86 context.setMode(mode); 88 context.setMode(mode);
87 CSSParserImpl parser(context, document.elementSheet().contents()); 89 CSSParserImpl parser(context, document.elementSheet().contents());
88 CSSTokenizer::Scope scope(string); 90 CSSTokenizerScope scope(string);
89 parser.consumeDeclarationList(scope.tokenRange(), StyleRule::Style); 91 parser.consumeDeclarationList(scope.tokenRange(), StyleRule::Style);
90 return createStylePropertySet(parser.m_parsedProperties, mode); 92 return createStylePropertySet(parser.m_parsedProperties, mode);
91 } 93 }
92 94
93 bool CSSParserImpl::parseDeclarationList(MutableStylePropertySet* declaration, c onst String& string, const CSSParserContext& context) 95 bool CSSParserImpl::parseDeclarationList(MutableStylePropertySet* declaration, c onst String& string, const CSSParserContext& context)
94 { 96 {
95 CSSParserImpl parser(context); 97 CSSParserImpl parser(context);
96 StyleRule::Type ruleType = StyleRule::Style; 98 StyleRule::Type ruleType = StyleRule::Style;
97 if (declaration->cssParserMode() == CSSViewportRuleMode) 99 if (declaration->cssParserMode() == CSSViewportRuleMode)
98 ruleType = StyleRule::Viewport; 100 ruleType = StyleRule::Viewport;
99 CSSTokenizer::Scope scope(string); 101 CSSTokenizerScope scope(string);
100 parser.consumeDeclarationList(scope.tokenRange(), ruleType); 102 parser.consumeDeclarationList(scope.tokenRange(), ruleType);
101 if (parser.m_parsedProperties.isEmpty()) 103 if (parser.m_parsedProperties.isEmpty())
102 return false; 104 return false;
103 return declaration->addParsedProperties(parser.m_parsedProperties); 105 return declaration->addParsedProperties(parser.m_parsedProperties);
104 } 106 }
105 107
106 PassRefPtrWillBeRawPtr<StyleRuleBase> CSSParserImpl::parseRule(const String& str ing, const CSSParserContext& context, AllowedRulesType allowedRules) 108 PassRefPtrWillBeRawPtr<StyleRuleBase> CSSParserImpl::parseRule(const String& str ing, const CSSParserContext& context, AllowedRulesType allowedRules)
107 { 109 {
108 CSSParserImpl parser(context); 110 CSSParserImpl parser(context);
109 CSSTokenizer::Scope scope(string); 111 CSSTokenizerScope scope(string);
110 CSSParserTokenRange range = scope.tokenRange(); 112 CSSParserTokenRange range = scope.tokenRange();
111 range.consumeWhitespace(); 113 range.consumeWhitespace();
112 if (range.atEnd()) 114 if (range.atEnd())
113 return nullptr; // Parse error, empty rule 115 return nullptr; // Parse error, empty rule
114 RefPtrWillBeRawPtr<StyleRuleBase> rule; 116 RefPtrWillBeRawPtr<StyleRuleBase> rule;
115 if (range.peek().type() == AtKeywordToken) 117 if (range.peek().type() == AtKeywordToken)
116 rule = parser.consumeAtRule(range, allowedRules); 118 rule = parser.consumeAtRule(range, allowedRules);
117 else 119 else
118 rule = parser.consumeQualifiedRule(range, allowedRules); 120 rule = parser.consumeQualifiedRule(range, allowedRules);
119 if (!rule) 121 if (!rule)
120 return nullptr; // Parse error, failed to consume rule 122 return nullptr; // Parse error, failed to consume rule
121 range.consumeWhitespace(); 123 range.consumeWhitespace();
122 if (!rule || !range.atEnd()) 124 if (!rule || !range.atEnd())
123 return nullptr; // Parse error, trailing garbage 125 return nullptr; // Parse error, trailing garbage
124 return rule; 126 return rule;
125 } 127 }
126 128
127 void CSSParserImpl::parseStyleSheet(const String& string, const CSSParserContext & context, StyleSheetContents* styleSheet) 129 void CSSParserImpl::parseStyleSheet(const String& string, const CSSParserContext & context, StyleSheetContents* styleSheet)
128 { 130 {
129 TRACE_EVENT_BEGIN2( 131 TRACE_EVENT_BEGIN2(
130 "blink,blink_style", "CSSParserImpl::parseStyleSheet", 132 "blink,blink_style", "CSSParserImpl::parseStyleSheet",
131 "baseUrl", context.baseURL().string().utf8(), 133 "baseUrl", context.baseURL().string().utf8(),
132 "mode", context.mode()); 134 "mode", context.mode());
133 135
134 TRACE_EVENT_BEGIN0("blink,blink_style", "CSSParserImpl::parseStyleSheet.toke nize"); 136 TRACE_EVENT_BEGIN0("blink,blink_style", "CSSParserImpl::parseStyleSheet.toke nize");
135 CSSTokenizer::Scope scope(string); 137 CSSTokenizerScope scope(string);
136 TRACE_EVENT_END0("blink,blink_style", "CSSParserImpl::parseStyleSheet.tokeni ze"); 138 TRACE_EVENT_END0("blink,blink_style", "CSSParserImpl::parseStyleSheet.tokeni ze");
137 139
138 TRACE_EVENT_BEGIN0("blink,blink_style", "CSSParserImpl::parseStyleSheet.pars e"); 140 TRACE_EVENT_BEGIN0("blink,blink_style", "CSSParserImpl::parseStyleSheet.pars e");
139 CSSParserImpl parser(context, styleSheet); 141 CSSParserImpl parser(context, styleSheet);
140 bool firstRuleValid = parser.consumeRuleList(scope.tokenRange(), TopLevelRul eList, [&styleSheet](PassRefPtrWillBeRawPtr<StyleRuleBase> rule) { 142 bool firstRuleValid = parser.consumeRuleList(scope.tokenRange(), TopLevelRul eList, [&styleSheet](PassRefPtrWillBeRawPtr<StyleRuleBase> rule) {
141 if (rule->isCharsetRule()) 143 if (rule->isCharsetRule())
142 return; 144 return;
143 styleSheet->parserAppendRule(rule); 145 styleSheet->parserAppendRule(rule);
144 }); 146 });
145 styleSheet->setHasSyntacticallyValidCSSHeader(firstRuleValid); 147 styleSheet->setHasSyntacticallyValidCSSHeader(firstRuleValid);
146 TRACE_EVENT_END0("blink,blink_style", "CSSParserImpl::parseStyleSheet.parse" ); 148 TRACE_EVENT_END0("blink,blink_style", "CSSParserImpl::parseStyleSheet.parse" );
147 149
148 TRACE_EVENT_END2( 150 TRACE_EVENT_END2(
149 "blink,blink_style", "CSSParserImpl::parseStyleSheet", 151 "blink,blink_style", "CSSParserImpl::parseStyleSheet",
150 "tokenCount", scope.tokenCount(), 152 "tokenCount", scope.tokenCount(),
151 "length", string.length()); 153 "length", string.length());
152 } 154 }
153 155
154 PassOwnPtr<Vector<double>> CSSParserImpl::parseKeyframeKeyList(const String& key List) 156 PassOwnPtr<Vector<double>> CSSParserImpl::parseKeyframeKeyList(const String& key List)
155 { 157 {
156 return consumeKeyframeKeyList(CSSTokenizer::Scope(keyList).tokenRange()); 158 return consumeKeyframeKeyList(CSSTokenizerScope(keyList).tokenRange());
157 } 159 }
158 160
159 bool CSSParserImpl::supportsDeclaration(CSSParserTokenRange& range) 161 bool CSSParserImpl::supportsDeclaration(CSSParserTokenRange& range)
160 { 162 {
161 ASSERT(m_parsedProperties.isEmpty()); 163 ASSERT(m_parsedProperties.isEmpty());
162 consumeDeclaration(range, StyleRule::Style); 164 consumeDeclaration(range, StyleRule::Style);
163 bool result = !m_parsedProperties.isEmpty(); 165 bool result = !m_parsedProperties.isEmpty();
164 m_parsedProperties.clear(); 166 m_parsedProperties.clear();
165 return result; 167 return result;
166 } 168 }
167 169
168 void CSSParserImpl::parseDeclarationListForInspector(const String& declaration, const CSSParserContext& context, CSSParserObserver& observer) 170 void CSSParserImpl::parseDeclarationListForInspector(const String& declaration, const CSSParserContext& context, CSSParserObserver& observer)
169 { 171 {
170 CSSParserImpl parser(context); 172 CSSParserImpl parser(context);
171 CSSParserObserverWrapper wrapper(observer); 173 CSSParserObserverWrapper wrapper(observer);
172 parser.m_observerWrapper = &wrapper; 174 parser.m_observerWrapper = &wrapper;
173 CSSTokenizer::Scope scope(declaration, *parser.m_observerWrapper); 175 CSSTokenizerScope scope(declaration, *parser.m_observerWrapper);
174 observer.startRuleHeader(StyleRule::Style, 0); 176 observer.startRuleHeader(StyleRule::Style, 0);
175 observer.endRuleHeader(1); 177 observer.endRuleHeader(1);
176 parser.consumeDeclarationList(scope.tokenRange(), StyleRule::Style); 178 parser.consumeDeclarationList(scope.tokenRange(), StyleRule::Style);
177 } 179 }
178 180
179 void CSSParserImpl::parseStyleSheetForInspector(const String& string, const CSSP arserContext& context, CSSParserObserver& observer) 181 void CSSParserImpl::parseStyleSheetForInspector(const String& string, const CSSP arserContext& context, CSSParserObserver& observer)
180 { 182 {
181 RefPtrWillBeRawPtr<StyleSheetContents> sheet = StyleSheetContents::create(st rictCSSParserContext()); 183 RefPtrWillBeRawPtr<StyleSheetContents> sheet = StyleSheetContents::create(st rictCSSParserContext());
182 CSSParserImpl parser(context, sheet.get()); 184 CSSParserImpl parser(context, sheet.get());
183 CSSParserObserverWrapper wrapper(observer); 185 CSSParserObserverWrapper wrapper(observer);
184 parser.m_observerWrapper = &wrapper; 186 parser.m_observerWrapper = &wrapper;
185 CSSTokenizer::Scope scope(string, *parser.m_observerWrapper); 187 CSSTokenizerScope scope(string, *parser.m_observerWrapper);
186 parser.consumeRuleList(scope.tokenRange(), TopLevelRuleList, [](PassRefPtrWi llBeRawPtr<StyleRuleBase> rule) { }); 188 parser.consumeRuleList(scope.tokenRange(), TopLevelRuleList, [](PassRefPtrWi llBeRawPtr<StyleRuleBase> rule) { });
187 } 189 }
188 190
189 static CSSParserImpl::AllowedRulesType computeNewAllowedRules(CSSParserImpl::All owedRulesType allowedRules, StyleRuleBase* rule) 191 static CSSParserImpl::AllowedRulesType computeNewAllowedRules(CSSParserImpl::All owedRulesType allowedRules, StyleRuleBase* rule)
190 { 192 {
191 if (!rule || allowedRules == CSSParserImpl::KeyframeRules || allowedRules == CSSParserImpl::NoRules) 193 if (!rule || allowedRules == CSSParserImpl::KeyframeRules || allowedRules == CSSParserImpl::NoRules)
192 return allowedRules; 194 return allowedRules;
193 ASSERT(allowedRules <= CSSParserImpl::RegularRules); 195 ASSERT(allowedRules <= CSSParserImpl::RegularRules);
194 if (rule->isCharsetRule() || rule->isImportRule()) 196 if (rule->isCharsetRule() || rule->isImportRule())
195 return CSSParserImpl::AllowImportRules; 197 return CSSParserImpl::AllowImportRules;
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 m_observerWrapper->yieldCommentsBefore(range); 651 m_observerWrapper->yieldCommentsBefore(range);
650 m_observerWrapper->observer().endRuleBody(m_observerWrapper->endOffset(r ange)); 652 m_observerWrapper->observer().endRuleBody(m_observerWrapper->endOffset(r ange));
651 } 653 }
652 } 654 }
653 655
654 void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range, StyleRule::Typ e ruleType) 656 void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range, StyleRule::Typ e ruleType)
655 { 657 {
656 CSSParserTokenRange rangeCopy = range; // For inspector callbacks 658 CSSParserTokenRange rangeCopy = range; // For inspector callbacks
657 659
658 ASSERT(range.peek().type() == IdentToken); 660 ASSERT(range.peek().type() == IdentToken);
659 CSSPropertyID unresolvedProperty = range.consumeIncludingWhitespace().parseA sUnresolvedCSSPropertyID(); 661 CSSParserToken token = range.consumeIncludingWhitespace();
662 CSSPropertyID unresolvedProperty = token.parseAsUnresolvedCSSPropertyID();
660 if (range.consume().type() != ColonToken) 663 if (range.consume().type() != ColonToken)
661 return; // Parse error 664 return; // Parse error
662 665
663 bool important = false; 666 bool important = false;
664 const CSSParserToken* declarationValueEnd = range.end(); 667 const CSSParserToken* declarationValueEnd = range.end();
665 const CSSParserToken* last = range.end() - 1; 668 const CSSParserToken* last = range.end() - 1;
666 while (last->type() == WhitespaceToken) 669 while (last->type() == WhitespaceToken)
667 --last; 670 --last;
671
672 if (unresolvedProperty == CSSPropertyVariable) {
673 ASSERT(RuntimeEnabledFeatures::cssVariablesEnabled());
674 AtomicString variableName = token.value();
675 m_styleSheet->parserSetUsesVariables(true);
676 consumeVariableDeclarationValue(range.makeSubRange(&range.peek(), declar ationValueEnd), variableName);
677 return;
678 }
668 if (last->type() == IdentToken && last->valueEqualsIgnoringCase("important") ) { 679 if (last->type() == IdentToken && last->valueEqualsIgnoringCase("important") ) {
669 --last; 680 --last;
670 while (last->type() == WhitespaceToken) 681 while (last->type() == WhitespaceToken)
671 --last; 682 --last;
672 if (last->type() == DelimiterToken && last->delimiter() == '!') { 683 if (last->type() == DelimiterToken && last->delimiter() == '!') {
673 important = true; 684 important = true;
674 declarationValueEnd = last; 685 declarationValueEnd = last;
675 } 686 }
676 } 687 }
677 688
678 if (important && (ruleType == StyleRule::FontFace || ruleType == StyleRule:: Keyframes)) 689 if (important && (ruleType == StyleRule::FontFace || ruleType == StyleRule:: Keyframes))
679 return; 690 return;
680 691
681 if (m_observerWrapper && ruleType == StyleRule::Style) { 692 if (m_observerWrapper && ruleType == StyleRule::Style) {
682 size_t propertiesCount = m_parsedProperties.size(); 693 size_t propertiesCount = m_parsedProperties.size();
683 if (unresolvedProperty != CSSPropertyInvalid) 694 if (unresolvedProperty != CSSPropertyInvalid)
684 consumeDeclarationValue(range.makeSubRange(&range.peek(), declaratio nValueEnd), unresolvedProperty, important, ruleType); 695 consumeDeclarationValue(range.makeSubRange(&range.peek(), declaratio nValueEnd), unresolvedProperty, important, ruleType);
685 m_observerWrapper->observer().observeProperty( 696 m_observerWrapper->observer().observeProperty(
686 m_observerWrapper->startOffset(rangeCopy), m_observerWrapper->endOff set(rangeCopy), 697 m_observerWrapper->startOffset(rangeCopy), m_observerWrapper->endOff set(rangeCopy),
687 important, m_parsedProperties.size() != propertiesCount); 698 important, m_parsedProperties.size() != propertiesCount);
699 consumeDeclarationValue(range.makeSubRange(&range.peek(), declaratio nValueEnd), unresolvedProperty, important, ruleType);
688 return; 700 return;
689 } 701 }
690 702
691 if (unresolvedProperty == CSSPropertyInvalid) 703 if (unresolvedProperty == CSSPropertyInvalid)
692 return; 704 return;
693 705
694 consumeDeclarationValue(range.makeSubRange(&range.peek(), declarationValueEn d), unresolvedProperty, important, ruleType); 706 consumeDeclarationValue(range.makeSubRange(&range.peek(), declarationValueEn d), unresolvedProperty, important, ruleType);
695 } 707 }
696 708
709 void CSSParserImpl::consumeVariableDeclarationValue(CSSParserTokenRange range, c onst AtomicString& variableName)
710 {
711 switch (CSSVariableParser::parseVariableDefinition(range)) {
712 case CSSVariableParser::Invalid:
713 return;
714 case CSSVariableParser::Variable:
715 m_parsedProperties.append(CSSProperty(CSSPropertyVariable,
716 CSSVariableValue::create(variableName, CSSVariableData::create(range , false))));
717 return;
718 case CSSVariableParser::VariableWithReferences:
719 m_parsedProperties.append(CSSProperty(CSSPropertyVariable,
720 CSSVariableValue::create(variableName, CSSVariableData::create(range , true))));
721 return;
722 case CSSVariableParser::Initial:
723 m_parsedProperties.append(CSSProperty(CSSPropertyVariable,
724 CSSVariableValue::create(variableName, CSSValueInitial)));
725 return;
726 case CSSVariableParser::Inherit:
727 m_parsedProperties.append(CSSProperty(CSSPropertyVariable,
728 CSSVariableValue::create(variableName, CSSValueInherit)));
729 return;
730 }
731 }
732
697 void CSSParserImpl::consumeDeclarationValue(CSSParserTokenRange range, CSSProper tyID unresolvedProperty, bool important, StyleRule::Type ruleType) 733 void CSSParserImpl::consumeDeclarationValue(CSSParserTokenRange range, CSSProper tyID unresolvedProperty, bool important, StyleRule::Type ruleType)
698 { 734 {
699 bool usesRemUnits; 735 bool usesRemUnits, usesVariables;
700 CSSParserValueList valueList(range, usesRemUnits); 736 CSSParserValueList valueList(range, usesRemUnits, usesVariables);
701 if (!valueList.size()) 737 if (!valueList.size())
702 return; // Parser error 738 return; // Parser error
703 if (usesRemUnits && m_styleSheet) 739 if (m_styleSheet) {
704 m_styleSheet->parserSetUsesRemUnits(true); 740 if (usesRemUnits)
741 m_styleSheet->parserSetUsesRemUnits(true);
742 if (usesVariables)
743 m_styleSheet->parserSetUsesVariables(true);
744 }
705 CSSPropertyParser::parseValue(unresolvedProperty, important, &valueList, m_c ontext, m_parsedProperties, ruleType); 745 CSSPropertyParser::parseValue(unresolvedProperty, important, &valueList, m_c ontext, m_parsedProperties, ruleType);
706 } 746 }
707 747
708 PassOwnPtr<Vector<double>> CSSParserImpl::consumeKeyframeKeyList(CSSParserTokenR ange range) 748 PassOwnPtr<Vector<double>> CSSParserImpl::consumeKeyframeKeyList(CSSParserTokenR ange range)
709 { 749 {
710 OwnPtr<Vector<double>> result = adoptPtr(new Vector<double>); 750 OwnPtr<Vector<double>> result = adoptPtr(new Vector<double>);
711 while (true) { 751 while (true) {
712 range.consumeWhitespace(); 752 range.consumeWhitespace();
713 const CSSParserToken& token = range.consumeIncludingWhitespace(); 753 const CSSParserToken& token = range.consumeIncludingWhitespace();
714 if (token.type() == PercentageToken && token.numericValue() >= 0 && toke n.numericValue() <= 100) 754 if (token.type() == PercentageToken && token.numericValue() >= 0 && toke n.numericValue() <= 100)
715 result->append(token.numericValue() / 100); 755 result->append(token.numericValue() / 100);
716 else if (token.type() == IdentToken && token.valueEqualsIgnoringCase("fr om")) 756 else if (token.type() == IdentToken && token.valueEqualsIgnoringCase("fr om"))
717 result->append(0); 757 result->append(0);
718 else if (token.type() == IdentToken && token.valueEqualsIgnoringCase("to ")) 758 else if (token.type() == IdentToken && token.valueEqualsIgnoringCase("to "))
719 result->append(1); 759 result->append(1);
720 else 760 else
721 return nullptr; // Parser error, invalid value in keyframe selector 761 return nullptr; // Parser error, invalid value in keyframe selector
722 if (range.atEnd()) 762 if (range.atEnd())
723 return result.release(); 763 return result.release();
724 if (range.consume().type() != CommaToken) 764 if (range.consume().type() != CommaToken)
725 return nullptr; // Parser error 765 return nullptr; // Parser error
726 } 766 }
727 } 767 }
728 768
729 } // namespace blink 769 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698