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

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

Issue 23444051: Move the content-dependent RecreateLayer logic from aura::Window to RWHVA (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix linux_aura Created 7 years, 3 months 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/views/widget/native_widget_aura.h" 5 #include "ui/views/widget/native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "third_party/skia/include/core/SkRegion.h" 9 #include "third_party/skia/include/core/SkRegion.h"
10 #include "ui/aura/client/activation_client.h" 10 #include "ui/aura/client/activation_client.h"
(...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after
797 797
798 bool NativeWidgetAura::HasHitTestMask() const { 798 bool NativeWidgetAura::HasHitTestMask() const {
799 return delegate_->HasHitTestMask(); 799 return delegate_->HasHitTestMask();
800 } 800 }
801 801
802 void NativeWidgetAura::GetHitTestMask(gfx::Path* mask) const { 802 void NativeWidgetAura::GetHitTestMask(gfx::Path* mask) const {
803 DCHECK(mask); 803 DCHECK(mask);
804 delegate_->GetHitTestMask(mask); 804 delegate_->GetHitTestMask(mask);
805 } 805 }
806 806
807 scoped_refptr<ui::Texture> NativeWidgetAura::CopyTexture() { 807 void NativeWidgetAura::DidRecreateLayer(ui::Layer *old_layer,
808 // The layer we create doesn't have an external texture, so this should never 808 ui::Layer *new_layer) {
809 // get invoked. 809 // The layer we create doesn't have an external texture, so we don't need to
810 NOTREACHED(); 810 // do anything.
811 return scoped_refptr<ui::Texture>();
812 } 811 }
813 812
814 //////////////////////////////////////////////////////////////////////////////// 813 ////////////////////////////////////////////////////////////////////////////////
815 // NativeWidgetAura, ui::EventHandler implementation: 814 // NativeWidgetAura, ui::EventHandler implementation:
816 815
817 void NativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) { 816 void NativeWidgetAura::OnKeyEvent(ui::KeyEvent* event) {
818 DCHECK(window_); 817 DCHECK(window_);
819 if (event->is_char()) { 818 if (event->is_char()) {
820 // If a ui::InputMethod object is attached to the root window, character 819 // If a ui::InputMethod object is attached to the root window, character
821 // events are handled inside the object and are not passed to this function. 820 // events are handled inside the object and are not passed to this function.
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
1128 return aura::Env::GetInstance()->is_mouse_button_down(); 1127 return aura::Env::GetInstance()->is_mouse_button_down();
1129 } 1128 }
1130 1129
1131 // static 1130 // static
1132 bool NativeWidgetPrivate::IsTouchDown() { 1131 bool NativeWidgetPrivate::IsTouchDown() {
1133 return aura::Env::GetInstance()->is_touch_down(); 1132 return aura::Env::GetInstance()->is_touch_down();
1134 } 1133 }
1135 1134
1136 } // namespace internal 1135 } // namespace internal
1137 } // namespace views 1136 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698