| 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/display/screen.h" | 5 #include "ui/display/screen.h" |
| 6 | 6 |
| 7 #include "ui/display/display.h" | 7 #include "ui/display/display.h" |
| 8 #include "ui/gfx/geometry/rect.h" | 8 #include "ui/gfx/geometry/rect.h" |
| 9 | 9 |
| 10 namespace display { | 10 namespace display { |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 g_screen = CreateNativeScreen(); | 27 g_screen = CreateNativeScreen(); |
| 28 #endif | 28 #endif |
| 29 return g_screen; | 29 return g_screen; |
| 30 } | 30 } |
| 31 | 31 |
| 32 // static | 32 // static |
| 33 void Screen::SetScreenInstance(Screen* instance) { | 33 void Screen::SetScreenInstance(Screen* instance) { |
| 34 g_screen = instance; | 34 g_screen = instance; |
| 35 } | 35 } |
| 36 | 36 |
| 37 Display Screen::GetDisplayNearestView(gfx::NativeView view) const { |
| 38 // TODO(jinsukkim): Use |WindowForView()| to convert to window. |
| 39 return GetDisplayNearestWindow(view); |
| 40 } |
| 41 |
| 37 gfx::Rect Screen::ScreenToDIPRectInWindow(gfx::NativeView view, | 42 gfx::Rect Screen::ScreenToDIPRectInWindow(gfx::NativeView view, |
| 38 const gfx::Rect& screen_rect) const { | 43 const gfx::Rect& screen_rect) const { |
| 39 float scale = GetDisplayNearestWindow(view).device_scale_factor(); | 44 float scale = GetDisplayNearestWindow(view).device_scale_factor(); |
| 40 return ScaleToEnclosingRect(screen_rect, 1.0f / scale); | 45 return ScaleToEnclosingRect(screen_rect, 1.0f / scale); |
| 41 } | 46 } |
| 42 | 47 |
| 43 gfx::Rect Screen::DIPToScreenRectInWindow(gfx::NativeView view, | 48 gfx::Rect Screen::DIPToScreenRectInWindow(gfx::NativeView view, |
| 44 const gfx::Rect& dip_rect) const { | 49 const gfx::Rect& dip_rect) const { |
| 45 float scale = GetDisplayNearestWindow(view).device_scale_factor(); | 50 float scale = GetDisplayNearestWindow(view).device_scale_factor(); |
| 46 return ScaleToEnclosingRect(dip_rect, scale); | 51 return ScaleToEnclosingRect(dip_rect, scale); |
| 47 } | 52 } |
| 48 | 53 |
| 49 bool Screen::GetDisplayWithDisplayId(int64_t display_id, | 54 bool Screen::GetDisplayWithDisplayId(int64_t display_id, |
| 50 Display* display) const { | 55 Display* display) const { |
| 51 for (const Display& display_in_list : GetAllDisplays()) { | 56 for (const Display& display_in_list : GetAllDisplays()) { |
| 52 if (display_in_list.id() == display_id) { | 57 if (display_in_list.id() == display_id) { |
| 53 *display = display_in_list; | 58 *display = display_in_list; |
| 54 return true; | 59 return true; |
| 55 } | 60 } |
| 56 } | 61 } |
| 57 return false; | 62 return false; |
| 58 } | 63 } |
| 59 | 64 |
| 60 } // namespace display | 65 } // namespace display |
| OLD | NEW |