Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Side by Side Diff: views/widget/native_widget_aura.cc

Issue 8510076: Fix stale compositor references from ui::Layer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« ui/gfx/compositor/layer_unittest.cc ('K') | « views/view.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "views/widget/native_widget_aura.h" 5 #include "views/widget/native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "ui/aura/client/aura_constants.h" 8 #include "ui/aura/client/aura_constants.h"
9 #include "ui/aura/desktop.h" 9 #include "ui/aura/desktop.h"
10 #include "ui/aura/desktop_observer.h" 10 #include "ui/aura/desktop_observer.h"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 gfx::NativeWindow NativeWidgetAura::GetNativeWindow() const { 192 gfx::NativeWindow NativeWidgetAura::GetNativeWindow() const {
193 return window_; 193 return window_;
194 } 194 }
195 195
196 Widget* NativeWidgetAura::GetTopLevelWidget() { 196 Widget* NativeWidgetAura::GetTopLevelWidget() {
197 NativeWidgetPrivate* native_widget = GetTopLevelNativeWidget(GetNativeView()); 197 NativeWidgetPrivate* native_widget = GetTopLevelNativeWidget(GetNativeView());
198 return native_widget ? native_widget->GetWidget() : NULL; 198 return native_widget ? native_widget->GetWidget() : NULL;
199 } 199 }
200 200
201 const ui::Compositor* NativeWidgetAura::GetCompositor() const { 201 const ui::Compositor* NativeWidgetAura::GetCompositor() const {
202 return window_->layer()->compositor(); 202 return window_->layer()->GetCompositor();
203 } 203 }
204 204
205 ui::Compositor* NativeWidgetAura::GetCompositor() { 205 ui::Compositor* NativeWidgetAura::GetCompositor() {
206 return window_->layer()->compositor(); 206 return window_->layer()->GetCompositor();
207 } 207 }
208 208
209 void NativeWidgetAura::CalculateOffsetToAncestorWithLayer( 209 void NativeWidgetAura::CalculateOffsetToAncestorWithLayer(
210 gfx::Point* offset, 210 gfx::Point* offset,
211 ui::Layer** layer_parent) { 211 ui::Layer** layer_parent) {
212 if (layer_parent) 212 if (layer_parent)
213 *layer_parent = window_->layer(); 213 *layer_parent = window_->layer();
214 } 214 }
215 215
216 void NativeWidgetAura::ReorderLayers() { 216 void NativeWidgetAura::ReorderLayers() {
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 NOTIMPLEMENTED(); 721 NOTIMPLEMENTED();
722 } 722 }
723 723
724 // static 724 // static
725 bool NativeWidgetPrivate::IsMouseButtonDown() { 725 bool NativeWidgetPrivate::IsMouseButtonDown() {
726 return aura::Desktop::GetInstance()->IsMouseButtonDown(); 726 return aura::Desktop::GetInstance()->IsMouseButtonDown();
727 } 727 }
728 728
729 } // namespace internal 729 } // namespace internal
730 } // namespace views 730 } // namespace views
OLDNEW
« ui/gfx/compositor/layer_unittest.cc ('K') | « views/view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698