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 /ui/snapshot | |
| 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 'ui/snapshot')
| -rw-r--r-- | ui/snapshot/snapshot_aura.cc | 2 | ||||
| -rw-r--r-- | ui/snapshot/snapshot_aura_unittest.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/snapshot/snapshot_aura.cc b/ui/snapshot/snapshot_aura.cc index 8f7baa0..1cebfe9 100644 --- a/ui/snapshot/snapshot_aura.cc +++ b/ui/snapshot/snapshot_aura.cc @@ -42,7 +42,7 @@ bool GrabWindowSnapshot(gfx::NativeWindow window, window->GetBoundsInRootWindow().origin().OffsetFromOrigin()); aura::WindowEventDispatcher* dispatcher = window->GetDispatcher(); if (dispatcher) - dispatcher->host()->GetRootTransform().TransformRect(&read_pixels_bounds); + dispatcher->GetRootTransform().TransformRect(&read_pixels_bounds); gfx::Rect read_pixels_bounds_in_pixel = gfx::ToEnclosingRect(read_pixels_bounds); diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index 16e58114..da46bcc 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -85,8 +85,8 @@ class SnapshotAuraTest : public testing::Test { aura::TestScreen* test_screen() { return helper_->test_screen(); } void WaitForDraw() { - dispatcher()->host()->compositor()->ScheduleDraw(); - ui::DrawWaiterForTest::Wait(dispatcher()->host()->compositor()); + dispatcher()->compositor()->ScheduleDraw(); + ui::DrawWaiterForTest::Wait(dispatcher()->compositor()); } void SetupTestWindow(const gfx::Rect& window_bounds) { |