diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-10 20:42:47 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-10 20:42:47 +0000 |
| commit | 5981e2d822372fb03c7e97ac122f4f7290dd499f (patch) | |
| tree | aea82a17bc92fbe092720dbb879202c5dea83976 /ui/surface | |
| parent | c3da595f4c87b295db2bfbf56fcf994f53881449 (diff) | |
| download | chromium_src-5981e2d822372fb03c7e97ac122f4f7290dd499f.zip chromium_src-5981e2d822372fb03c7e97ac122f4f7290dd499f.tar.gz chromium_src-5981e2d822372fb03c7e97ac122f4f7290dd499f.tar.bz2 | |
Move ui/base/win/dpi.h to ui/gfx/dpi_win.h
Also moves hidpi switch to gfx/switches.h
R=sky@chromium.org
http://crbug.com/103304
Review URL: https://codereview.chromium.org/23451036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/surface')
| -rw-r--r-- | ui/surface/accelerated_surface_win.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/surface/accelerated_surface_win.cc b/ui/surface/accelerated_surface_win.cc index 0a6adcb..502678b 100644 --- a/ui/surface/accelerated_surface_win.cc +++ b/ui/surface/accelerated_surface_win.cc @@ -26,9 +26,9 @@ #include "media/base/video_util.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/latency_info.h" -#include "ui/base/win/dpi.h" #include "ui/base/win/hwnd_util.h" #include "ui/base/win/shell.h" +#include "ui/gfx/dpi_win.h" #include "ui/gfx/rect.h" #include "ui/gl/gl_switches.h" #include "ui/surface/accelerated_surface_transformer_win.h" @@ -720,11 +720,11 @@ void AcceleratedPresenter::DoPresentAndAcknowledge( // presented then drop the frame. gfx::Size window_size = GetWindowSize(); bool size_mismatch = size != window_size; - if (ui::IsInHighDPIMode()) { + if (gfx::IsInHighDPIMode()) { // Check if the size mismatch is within allowable round off or truncation // error. - gfx::Size dip_size = ui::win::ScreenToDIPSize(window_size); - gfx::Size pixel_size = ui::win::DIPToScreenSize(dip_size); + gfx::Size dip_size = gfx::win::ScreenToDIPSize(window_size); + gfx::Size pixel_size = gfx::win::DIPToScreenSize(dip_size); size_mismatch = abs(window_size.width() - size.width()) > abs(window_size.width() - pixel_size.width()) || abs(window_size.height() - size.height()) > |