diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 03:42:27 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 03:42:27 +0000 |
| commit | 2374d1813659c2420eda25c884c5f943b292a64d (patch) | |
| tree | 580d99257dd5a9d6a84de4fa70d583d17e985b4c /ash/debug.cc | |
| parent | b5126da4daa8f0f0f408afb93e0683f1cf34c82a (diff) | |
| download | chromium_src-2374d1813659c2420eda25c884c5f943b292a64d.zip chromium_src-2374d1813659c2420eda25c884c5f943b292a64d.tar.gz chromium_src-2374d1813659c2420eda25c884c5f943b292a64d.tar.bz2 | |
Window ownership -> WindowTreeHost
Replaces Window::GetDispatcher with Window::GetHost().
Had to clear ScreenPositionClient property prior to window teardown as tests on desktop delete it prior to destroying the window hierarchy. Unhooking the property appears to have no ill-effect.
R=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/184903003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/debug.cc')
| -rw-r--r-- | ash/debug.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/debug.cc b/ash/debug.cc index 68ff590..d72b58f 100644 --- a/ash/debug.cc +++ b/ash/debug.cc @@ -18,7 +18,7 @@ void ToggleShowDebugBorders() { scoped_ptr<bool> value; for (aura::Window::Windows::iterator it = root_windows.begin(); it != root_windows.end(); ++it) { - ui::Compositor* compositor = (*it)->GetDispatcher()->host()->compositor(); + ui::Compositor* compositor = (*it)->GetHost()->compositor(); cc::LayerTreeDebugState state = compositor->GetLayerTreeDebugState(); if (!value.get()) value.reset(new bool(!state.show_debug_borders)); @@ -33,7 +33,7 @@ void ToggleShowFpsCounter() { scoped_ptr<bool> value; for (aura::Window::Windows::iterator it = root_windows.begin(); it != root_windows.end(); ++it) { - ui::Compositor* compositor = (*it)->GetDispatcher()->host()->compositor(); + ui::Compositor* compositor = (*it)->GetHost()->compositor(); cc::LayerTreeDebugState state = compositor->GetLayerTreeDebugState(); if (!value.get()) value.reset(new bool(!state.show_fps_counter)); @@ -48,7 +48,7 @@ void ToggleShowPaintRects() { scoped_ptr<bool> value; for (aura::Window::Windows::iterator it = root_windows.begin(); it != root_windows.end(); ++it) { - ui::Compositor* compositor = (*it)->GetDispatcher()->host()->compositor(); + ui::Compositor* compositor = (*it)->GetHost()->compositor(); cc::LayerTreeDebugState state = compositor->GetLayerTreeDebugState(); if (!value.get()) value.reset(new bool(!state.show_paint_rects)); |