summaryrefslogtreecommitdiffstats
path: root/ash/magnifier
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 21:51:57 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 21:51:57 +0000
commitd2d18a1aac19bea3324a160c07c6f850ad764c03 (patch)
treefe164815aca553375ca6f7573eed73edcc80fd3f /ash/magnifier
parent5046460c941b82cfd5cad8d627d3737574c076dd (diff)
downloadchromium_src-d2d18a1aac19bea3324a160c07c6f850ad764c03.zip
chromium_src-d2d18a1aac19bea3324a160c07c6f850ad764c03.tar.gz
chromium_src-d2d18a1aac19bea3324a160c07c6f850ad764c03.tar.bz2
Use the source display's pixel (host) size as a mirror window's size
so that we can copy texture as is. - store gfx::Display object for mirrored display instead of just id because we need one for mirror root window. - use host window's coordinate for mirror cursor window. BUG=239776 TEST=covered by unit tests Review URL: https://chromiumcodereview.appspot.com/15730006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202985 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
-rw-r--r--ash/magnifier/magnification_controller.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
index ec0a7bc..bb50285 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -4,9 +4,9 @@
#include "ash/magnifier/magnification_controller.h"
-#include "ash/ash_root_window_transformer.h"
#include "ash/display/display_controller.h"
#include "ash/display/display_manager.h"
+#include "ash/display/root_window_transformers.h"
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/system/tray/system_tray_delegate.h"
@@ -274,7 +274,7 @@ bool MagnificationControllerImpl::RedrawDIP(const gfx::PointF& position_in_dip,
gfx::Display display =
Shell::GetScreen()->GetDisplayNearestWindow(root_window_);
scoped_ptr<aura::RootWindowTransformer> transformer(
- new AshRootWindowTransformer(root_window_, display));
+ internal::CreateRootWindowTransformerForDisplay(root_window_, display));
root_window_->SetRootWindowTransformer(transformer.Pass());
if (animate)