ui/gfx/screen_mac.mm - Issue 1777653002: Prepare ui/ module for compilation with OS X 10.7 deployment target.

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: ui/gfx/screen_mac.mm

Issue 1777653002: Prepare ui/ module for compilation with OS X 10.7 deployment target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More compile errors. Created 4 years, 9 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: ui/gfx/screen_mac.mm

diff --git a/ui/gfx/screen_mac.mm b/ui/gfx/screen_mac.mm

index 6fb7c6e8dc284f597a9f5cac0b9966d085968b97..1ee6938e84b42ed9b43396fe7f2ea1de6f24f3a9 100644

--- a/ui/gfx/screen_mac.mm

+++ b/ui/gfx/screen_mac.mm

@@ -72,11 +72,7 @@ gfx::Display GetDisplayForScreen(NSScreen* screen) {

display.set_bounds(ConvertCoordinateSystem(frame));

display.set_work_area(ConvertCoordinateSystem(visible_frame));

}

- CGFloat scale;

- if ([screen respondsToSelector:@selector(backingScaleFactor)])

- scale = [screen backingScaleFactor];

- else

- scale = [screen userSpaceScaleFactor];

+ CGFloat scale = [screen backingScaleFactor];

if (gfx::Display::HasForceDeviceScaleFactor())

scale = gfx::Display::GetForcedDeviceScaleFactor();

« no previous file with comments | « ui/events/cocoa/events_mac_unittest.mm ('k') | ui/snapshot/snapshot_mac.mm » ('j') | no next file with comments »