third_party/WebKit/Source/core/css/RuleSet.cpp - Issue 1583913003: Introduce deviceDependentMediaQueries (similar to viewportDependent).

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: third_party/WebKit/Source/core/css/RuleSet.cpp

Issue 1583913003: Introduce deviceDependentMediaQueries (similar to viewportDependent). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: review fixes Created 4 years, 11 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

« no previous file with comments | « third_party/WebKit/Source/core/css/RuleSet.h ('k') | third_party/WebKit/Source/core/css/resolver/ScopedStyleResolver.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/css/RuleSet.cpp

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

index 7839eba7360970244f995cb81d97c6ae6ca9ffe5..db68b88cfd0aa6e67f6b0ecee2cc744aa9ef00e1 100644

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

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

@@ -270,7 +270,7 @@ void RuleSet::addChildRules(const WillBeHeapVector<RefPtrWillBeMember<StyleRuleB

addPageRule(toStyleRulePage(rule));

} else if (rule->isMediaRule()) {

StyleRuleMedia* mediaRule = toStyleRuleMedia(rule);

- if ((!mediaRule->mediaQueries() || medium.eval(mediaRule->mediaQueries(), &m_viewportDependentMediaQueryResults)))

+ if ((!mediaRule->mediaQueries() || medium.eval(mediaRule->mediaQueries(), &m_viewportDependentMediaQueryResults, &m_deviceDependentMediaQueryResults)))

addChildRules(mediaRule->childRules(), medium, addRuleFlags);

} else if (rule->isFontFaceRule()) {

addFontFaceRule(toStyleRuleFontFace(rule));

@@ -293,7 +293,7 @@ void RuleSet::addRulesFromSheet(StyleSheetContents* sheet, const MediaQueryEvalu

const WillBeHeapVector<RefPtrWillBeMember<StyleRuleImport>>& importRules = sheet->importRules();

for (unsigned i = 0; i < importRules.size(); ++i) {

StyleRuleImport* importRule = importRules[i].get();

- if (importRule->styleSheet() && (!importRule->mediaQueries() || medium.eval(importRule->mediaQueries(), &m_viewportDependentMediaQueryResults)))

+ if (importRule->styleSheet() && (!importRule->mediaQueries() || medium.eval(importRule->mediaQueries(), &m_viewportDependentMediaQueryResults, &m_deviceDependentMediaQueryResults)))

addRulesFromSheet(importRule->styleSheet(), medium, addRuleFlags);

}

@@ -384,6 +384,7 @@ DEFINE_TRACE(RuleSet)

visitor->trace(m_deepCombinatorOrShadowPseudoRules);

visitor->trace(m_shadowDistributedRules);

visitor->trace(m_viewportDependentMediaQueryResults);

+ visitor->trace(m_deviceDependentMediaQueryResults);

visitor->trace(m_pendingRules);

#ifndef NDEBUG

visitor->trace(m_allRules);