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

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

Issue 2405143003: Separate @viewport from other RuleSet construction. (Closed)
Patch Set: Missing resolve() Created 4 years, 2 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 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/CSSCustomIdentValue.h" 7 #include "core/css/CSSCustomIdentValue.h"
8 #include "core/css/CSSCustomPropertyDeclaration.h" 8 #include "core/css/CSSCustomPropertyDeclaration.h"
9 #include "core/css/CSSKeyframesRule.h" 9 #include "core/css/CSSKeyframesRule.h"
10 #include "core/css/CSSStyleSheet.h" 10 #include "core/css/CSSStyleSheet.h"
(...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after
607 607
608 if (m_observerWrapper) { 608 if (m_observerWrapper) {
609 unsigned endOffset = m_observerWrapper->endOffset(prelude); 609 unsigned endOffset = m_observerWrapper->endOffset(prelude);
610 m_observerWrapper->observer().startRuleHeader( 610 m_observerWrapper->observer().startRuleHeader(
611 StyleRule::Viewport, m_observerWrapper->startOffset(prelude)); 611 StyleRule::Viewport, m_observerWrapper->startOffset(prelude));
612 m_observerWrapper->observer().endRuleHeader(endOffset); 612 m_observerWrapper->observer().endRuleHeader(endOffset);
613 m_observerWrapper->observer().startRuleBody(endOffset); 613 m_observerWrapper->observer().startRuleBody(endOffset);
614 m_observerWrapper->observer().endRuleBody(endOffset); 614 m_observerWrapper->observer().endRuleBody(endOffset);
615 } 615 }
616 616
617 if (m_styleSheet)
618 m_styleSheet->setHasViewportRule();
619
617 consumeDeclarationList(block, StyleRule::Viewport); 620 consumeDeclarationList(block, StyleRule::Viewport);
618 return StyleRuleViewport::create( 621 return StyleRuleViewport::create(
619 createStylePropertySet(m_parsedProperties, CSSViewportRuleMode)); 622 createStylePropertySet(m_parsedProperties, CSSViewportRuleMode));
620 } 623 }
621 624
622 StyleRuleFontFace* CSSParserImpl::consumeFontFaceRule( 625 StyleRuleFontFace* CSSParserImpl::consumeFontFaceRule(
623 CSSParserTokenRange prelude, 626 CSSParserTokenRange prelude,
624 CSSParserTokenRange block) { 627 CSSParserTokenRange block) {
625 if (!prelude.atEnd()) 628 if (!prelude.atEnd())
626 return nullptr; // Parse error; @font-face prelude should be empty 629 return nullptr; // Parse error; @font-face prelude should be empty
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
932 else 935 else
933 return nullptr; // Parser error, invalid value in keyframe selector 936 return nullptr; // Parser error, invalid value in keyframe selector
934 if (range.atEnd()) 937 if (range.atEnd())
935 return result; 938 return result;
936 if (range.consume().type() != CommaToken) 939 if (range.consume().type() != CommaToken)
937 return nullptr; // Parser error 940 return nullptr; // Parser error
938 } 941 }
939 } 942 }
940 943
941 } // namespace blink 944 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/StyleSheetList.h ('k') | third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698