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

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

Issue 1653303002: Rename prelude to range in parsePageSelector (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "core/css/parser/CSSParserImpl.h" 5 #include "core/css/parser/CSSParserImpl.h"
6 6
7 #include "core/css/CSSCustomPropertyDeclaration.h" 7 #include "core/css/CSSCustomPropertyDeclaration.h"
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/StylePropertySet.h" 10 #include "core/css/StylePropertySet.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 }); 167 });
168 styleSheet->setHasSyntacticallyValidCSSHeader(firstRuleValid); 168 styleSheet->setHasSyntacticallyValidCSSHeader(firstRuleValid);
169 TRACE_EVENT_END0("blink,blink_style", "CSSParserImpl::parseStyleSheet.parse" ); 169 TRACE_EVENT_END0("blink,blink_style", "CSSParserImpl::parseStyleSheet.parse" );
170 170
171 TRACE_EVENT_END2( 171 TRACE_EVENT_END2(
172 "blink,blink_style", "CSSParserImpl::parseStyleSheet", 172 "blink,blink_style", "CSSParserImpl::parseStyleSheet",
173 "tokenCount", scope.tokenCount(), 173 "tokenCount", scope.tokenCount(),
174 "length", string.length()); 174 "length", string.length());
175 } 175 }
176 176
177 CSSSelectorList CSSParserImpl::parsePageSelector(CSSParserTokenRange prelude, St yleSheetContents* styleSheet) 177 CSSSelectorList CSSParserImpl::parsePageSelector(CSSParserTokenRange range, Styl eSheetContents* styleSheet)
178 { 178 {
179 prelude.consumeWhitespace(); 179 // We only support a small subset of the css-page spec.
180 range.consumeWhitespace();
180 AtomicString typeSelector; 181 AtomicString typeSelector;
181 if (prelude.peek().type() == IdentToken) 182 if (range.peek().type() == IdentToken)
182 typeSelector = prelude.consume().value(); 183 typeSelector = range.consume().value();
183 184
184 AtomicString pseudo; 185 AtomicString pseudo;
185 if (prelude.peek().type() == ColonToken) { 186 if (range.peek().type() == ColonToken) {
186 prelude.consume(); 187 range.consume();
187 if (prelude.peek().type() != IdentToken) 188 if (range.peek().type() != IdentToken)
188 return CSSSelectorList(); 189 return CSSSelectorList();
189 pseudo = prelude.consume().value(); 190 pseudo = range.consume().value();
190 } 191 }
191 192
192 prelude.consumeWhitespace(); 193 range.consumeWhitespace();
193 if (!prelude.atEnd()) 194 if (!range.atEnd())
194 return CSSSelectorList(); // Parse error; extra tokens in @page header 195 return CSSSelectorList(); // Parse error; extra tokens in @page selector
195 196
196 OwnPtr<CSSParserSelector> selector; 197 OwnPtr<CSSParserSelector> selector;
197 if (!typeSelector.isNull() && pseudo.isNull()) { 198 if (!typeSelector.isNull() && pseudo.isNull()) {
198 selector = CSSParserSelector::create(QualifiedName(nullAtom, typeSelecto r, styleSheet->defaultNamespace())); 199 selector = CSSParserSelector::create(QualifiedName(nullAtom, typeSelecto r, styleSheet->defaultNamespace()));
199 } else { 200 } else {
200 selector = CSSParserSelector::create(); 201 selector = CSSParserSelector::create();
201 if (!pseudo.isNull()) { 202 if (!pseudo.isNull()) {
202 selector->setMatch(CSSSelector::PagePseudoClass); 203 selector->setMatch(CSSSelector::PagePseudoClass);
203 selector->updatePseudoType(pseudo.lower()); 204 selector->updatePseudoType(pseudo.lower());
204 if (selector->pseudoType() == CSSSelector::PseudoUnknown) 205 if (selector->pseudoType() == CSSSelector::PseudoUnknown)
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 consumeRuleList(block, KeyframesRuleList, [keyframeRule](PassRefPtrWillBeRaw Ptr<StyleRuleBase> keyframe) { 573 consumeRuleList(block, KeyframesRuleList, [keyframeRule](PassRefPtrWillBeRaw Ptr<StyleRuleBase> keyframe) {
573 keyframeRule->parserAppendKeyframe(toStyleRuleKeyframe(keyframe.get())); 574 keyframeRule->parserAppendKeyframe(toStyleRuleKeyframe(keyframe.get()));
574 }); 575 });
575 keyframeRule->setName(name); 576 keyframeRule->setName(name);
576 keyframeRule->setVendorPrefixed(webkitPrefixed); 577 keyframeRule->setVendorPrefixed(webkitPrefixed);
577 return keyframeRule.release(); 578 return keyframeRule.release();
578 } 579 }
579 580
580 PassRefPtrWillBeRawPtr<StyleRulePage> CSSParserImpl::consumePageRule(CSSParserTo kenRange prelude, CSSParserTokenRange block) 581 PassRefPtrWillBeRawPtr<StyleRulePage> CSSParserImpl::consumePageRule(CSSParserTo kenRange prelude, CSSParserTokenRange block)
581 { 582 {
582 // We only support a small subset of the css-page spec.
583 CSSSelectorList selectorList = parsePageSelector(prelude, m_styleSheet); 583 CSSSelectorList selectorList = parsePageSelector(prelude, m_styleSheet);
584 if (!selectorList.isValid()) 584 if (!selectorList.isValid())
585 return nullptr; 585 return nullptr; // Parse error, invalid @page selector
586 586
587 if (m_observerWrapper) { 587 if (m_observerWrapper) {
588 unsigned endOffset = m_observerWrapper->endOffset(prelude); 588 unsigned endOffset = m_observerWrapper->endOffset(prelude);
589 m_observerWrapper->observer().startRuleHeader(StyleRule::Page, m_observe rWrapper->startOffset(prelude)); 589 m_observerWrapper->observer().startRuleHeader(StyleRule::Page, m_observe rWrapper->startOffset(prelude));
590 m_observerWrapper->observer().endRuleHeader(endOffset); 590 m_observerWrapper->observer().endRuleHeader(endOffset);
591 } 591 }
592 592
593 consumeDeclarationList(block, StyleRule::Style); 593 consumeDeclarationList(block, StyleRule::Style);
594 594
595 return StyleRulePage::create(std::move(selectorList), createStylePropertySet (m_parsedProperties, m_context.mode())); 595 return StyleRulePage::create(std::move(selectorList), createStylePropertySet (m_parsedProperties, m_context.mode()));
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 else 768 else
769 return nullptr; // Parser error, invalid value in keyframe selector 769 return nullptr; // Parser error, invalid value in keyframe selector
770 if (range.atEnd()) 770 if (range.atEnd())
771 return result.release(); 771 return result.release();
772 if (range.consume().type() != CommaToken) 772 if (range.consume().type() != CommaToken)
773 return nullptr; // Parser error 773 return nullptr; // Parser error
774 } 774 }
775 } 775 }
776 776
777 } // namespace blink 777 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698