Source/core/css/resolver/StyleResolver.h - Issue 25257003: Empty @viewport should not override legacy viewport.

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/resolver/StyleResolver.h

Issue 25257003: Empty @viewport should not override legacy viewport. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 7 years, 3 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-legacy-ordering-10-expected.txt ('K') | « Source/core/css/resolver/ScopedStyleResolver.cpp ('k') | Source/core/css/resolver/StyleResolver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/resolver/StyleResolver.h

diff --git a/Source/core/css/resolver/StyleResolver.h b/Source/core/css/resolver/StyleResolver.h

index 16cf4013a9ada8e69fcce736837d932b7ced3ded..b98d10f730ca408c8932fe7c83749c5934a3ede6 100644

--- a/Source/core/css/resolver/StyleResolver.h

+++ b/Source/core/css/resolver/StyleResolver.h

@@ -269,12 +269,6 @@ public:

// FIXME: StyleResolver should not have this member or method.

InspectorCSSOMWrappers& inspectorCSSOMWrappers() { return m_inspectorCSSOMWrappers; }

- enum ViewportOrigin { UserAgentOrigin, AuthorOrigin };

- // Exposed for ScopedStyleResolver.

- // FIXME: Likely belongs on viewportStyleResolver.

- void collectViewportRules(RuleSet*, ViewportOrigin);

const RuleFeatureSet& ruleFeatureSet() const { return m_features; }

StyleSharingList& styleSharingList() { return m_styleSharingList; }