Source/core/css/RuleSet.cpp - Issue 19555002: Translate viewport related meta tags into @viewport descriptors as suggested by the CSS Device Adap…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/css/RuleSet.cpp

Issue 19555002: Translate viewport related meta tags into @viewport descriptors as suggested by the CSS Device Adap… (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 4 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 side-by-side diff with in-line comments

Download patch

« LayoutTests/fast/viewport/viewport-131-expected.txt ('K') | « Source/core/css/DocumentRuleSets.cpp ('k') | Source/core/css/StyleRule.cpp » ('j') | Source/core/css/resolver/ViewportStyleResolver.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/RuleSet.cpp

diff --git a/Source/core/css/RuleSet.cpp b/Source/core/css/RuleSet.cpp

index e6941096cfb64b7e23952bb22cc0b81178052d12..0e044e37ae14029f31cb5920d6b38df2a26ef091 100644

--- a/Source/core/css/RuleSet.cpp

+++ b/Source/core/css/RuleSet.cpp

@@ -393,8 +393,7 @@ void RuleSet::addChildRules(const Vector<RefPtr<StyleRuleBase> >& rules, const M

resolver->setBuildScopedStyleTreeInDocumentOrder(false);

resolver->ensureScopedStyleResolver(scope->shadowHost())->addHostRule(static_cast<StyleRuleHost*>(rule), hasDocumentSecurityOrigin, scope);

resolver->setBuildScopedStyleTreeInDocumentOrder(enabled);

- } else if (RuntimeEnabledFeatures::cssViewportEnabled() && rule->isViewportRule()) {

- // @viewport should not be scoped.

+ } else if (rule->isViewportRule()) {

if (!isDocumentScope(scope))

continue;

addViewportRule(static_cast<StyleRuleViewport*>(rule));