diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 01:45:11 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-20 01:45:11 +0000 |
| commit | 141e64b54c11354f0e1edf6bc463904039cc07a8 (patch) | |
| tree | 47349d0febe586521d128a957f6e98b96099ccdb /ash/magnifier | |
| parent | 8520ebd2d0fad750b0841f4d8dae1e517f0c400f (diff) | |
| download | chromium_src-141e64b54c11354f0e1edf6bc463904039cc07a8.zip chromium_src-141e64b54c11354f0e1edf6bc463904039cc07a8.tar.gz chromium_src-141e64b54c11354f0e1edf6bc463904039cc07a8.tar.bz2 | |
Revert 236017 "Move some non-event related functionality from Ro..."
> Move some non-event related functionality from RootWindow onto RootWindowHost.
>
> - Transform logic
> - Compositor
>
> R=sky@chromium.org
> http://crbug.com/308843
>
> Review URL: https://codereview.chromium.org/70103020
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/77233002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236094 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/magnifier')
| -rw-r--r-- | ash/magnifier/magnification_controller.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 66bebf2..0df6e12 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc @@ -44,7 +44,7 @@ const int kPanningMergin = 100; void MoveCursorTo(aura::RootWindow* root_window, const gfx::Point& root_location) { gfx::Point3F host_location_3f(root_location); - root_window->host()->GetRootTransform().TransformPoint(&host_location_3f); + root_window->GetRootTransform().TransformPoint(&host_location_3f); root_window->MoveCursorToHostLocation( gfx::ToCeiledPoint(host_location_3f.AsPointF())); } @@ -273,8 +273,7 @@ bool MagnificationControllerImpl::RedrawDIP(const gfx::PointF& position_in_dip, Shell::GetScreen()->GetDisplayNearestWindow(root_window_); scoped_ptr<aura::RootWindowTransformer> transformer( internal::CreateRootWindowTransformerForDisplay(root_window_, display)); - root_window_->GetDispatcher()->host()->SetRootWindowTransformer( - transformer.Pass()); + root_window_->GetDispatcher()->SetRootWindowTransformer(transformer.Pass()); if (animate) is_on_animation_ = true; |