OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ui/gfx/screen.h" | 5 #include "ui/display/screen.h" |
6 | 6 |
| 7 #include "ui/display/display.h" |
7 #include "ui/gfx/geometry/rect.h" | 8 #include "ui/gfx/geometry/rect.h" |
8 | 9 |
9 namespace gfx { | 10 namespace display { |
10 | 11 |
11 namespace { | 12 namespace { |
12 | 13 |
13 Screen* g_screen; | 14 Screen* g_screen; |
14 | 15 |
15 } // namespace | 16 } // namespace |
16 | 17 |
17 Screen::Screen() { | 18 Screen::Screen() {} |
18 } | |
19 | 19 |
20 Screen::~Screen() { | 20 Screen::~Screen() {} |
21 } | |
22 | 21 |
23 // static | 22 // static |
24 Screen* Screen::GetScreen() { | 23 Screen* Screen::GetScreen() { |
25 #if defined(OS_MACOSX) || defined(OS_ANDROID) | 24 #if defined(OS_MACOSX) || defined(OS_ANDROID) |
26 // TODO(scottmg): https://crbug.com/558054 | 25 // TODO(scottmg): https://crbug.com/558054 |
27 if (!g_screen) | 26 if (!g_screen) |
28 g_screen = CreateNativeScreen(); | 27 g_screen = CreateNativeScreen(); |
29 #endif | 28 #endif |
30 return g_screen; | 29 return g_screen; |
31 } | 30 } |
32 | 31 |
33 // static | 32 // static |
34 void Screen::SetScreenInstance(Screen* instance) { | 33 void Screen::SetScreenInstance(Screen* instance) { |
35 g_screen = instance; | 34 g_screen = instance; |
36 } | 35 } |
37 | 36 |
38 gfx::Rect Screen::ScreenToDIPRectInWindow(NativeView view, | 37 gfx::Rect Screen::ScreenToDIPRectInWindow(gfx::NativeView view, |
39 const gfx::Rect& screen_rect) const { | 38 const gfx::Rect& screen_rect) const { |
40 float scale = GetDisplayNearestWindow(view).device_scale_factor(); | 39 float scale = GetDisplayNearestWindow(view).device_scale_factor(); |
41 return ScaleToEnclosingRect(screen_rect, 1.0f / scale); | 40 return ScaleToEnclosingRect(screen_rect, 1.0f / scale); |
42 } | 41 } |
43 | 42 |
44 gfx::Rect Screen::DIPToScreenRectInWindow(NativeView view, | 43 gfx::Rect Screen::DIPToScreenRectInWindow(gfx::NativeView view, |
45 const gfx::Rect& dip_rect) const { | 44 const gfx::Rect& dip_rect) const { |
46 float scale = GetDisplayNearestWindow(view).device_scale_factor(); | 45 float scale = GetDisplayNearestWindow(view).device_scale_factor(); |
47 return ScaleToEnclosingRect(dip_rect, scale); | 46 return ScaleToEnclosingRect(dip_rect, scale); |
48 } | 47 } |
49 | 48 |
50 } // namespace gfx | 49 } // namespace display |
OLD | NEW |