Source/core/css/MediaValues.h - Issue 335313003: MediaQueryEvaluator getting mediaType from MediaValues

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/MediaValues.h

Issue 335313003: MediaQueryEvaluator getting mediaType from MediaValues (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed a bug and added tests Created 6 years, 6 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

Index: Source/core/css/MediaValues.h

diff --git a/Source/core/css/MediaValues.h b/Source/core/css/MediaValues.h

index eee54657b371c687d06bc451da74984e36539e85..6ba4b387427f71279e57a1bb666e41b038a8861d 100644

--- a/Source/core/css/MediaValues.h

+++ b/Source/core/css/MediaValues.h

@@ -58,9 +58,7 @@ public:

virtual int monochromeBitsPerComponent() const = 0;

virtual PointerDeviceType pointer() const = 0;

virtual bool threeDEnabled() const = 0;

- virtual bool scanMediaType() const = 0;

- virtual bool screenMediaType() const = 0;

- virtual bool printMediaType() const = 0;

+ virtual const String mediaType() const = 0;

virtual bool strictMode() const = 0;

virtual Document* document() const = 0;

virtual bool hasValues() const = 0;

@@ -75,9 +73,7 @@ protected:

int calculateColorBitsPerComponent(LocalFrame*) const;

int calculateMonochromeBitsPerComponent(LocalFrame*) const;

int calculateDefaultFontSize(LocalFrame*) const;

- bool calculateScanMediaType(LocalFrame*) const;

- bool calculateScreenMediaType(LocalFrame*) const;

- bool calculatePrintMediaType(LocalFrame*) const;

+ const String calculateMediaType(LocalFrame*) const;

bool calculateThreeDEnabled(LocalFrame*) const;

MediaValues::PointerDeviceType calculateLeastCapablePrimaryPointerDeviceType(LocalFrame*) const;

« Source/core/css/MediaQueryEvaluator.cpp ('K') | « Source/core/css/MediaQueryMatcher.cpp ('k') | Source/core/css/MediaValues.cpp » ('j') | Source/core/css/MediaValuesCached.cpp » ('J')