summaryrefslogtreecommitdiffstats
path: root/ash/display
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-12 06:23:16 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-12 06:23:16 +0000
commit1ddbe9392e552c6a39219a4cb04516c2bbca60bc (patch)
tree3d4eb9617cdbf83281bd7ff28b34726e41c7b75a /ash/display
parentf4175ec2463eb9bdf7eabd6dba8318a9a064bcfc (diff)
downloadchromium_src-1ddbe9392e552c6a39219a4cb04516c2bbca60bc.zip
chromium_src-1ddbe9392e552c6a39219a4cb04516c2bbca60bc.tar.gz
chromium_src-1ddbe9392e552c6a39219a4cb04516c2bbca60bc.tar.bz2
Move the content-dependent RecreateLayer logic from aura::Window to RWHVA
aura::Window is the wrong place to reason about all the different types of external data that can go into layer, its delegate (RWHVA) is better suited. So move that logic there. BUG=263068 Review URL: https://chromiumcodereview.appspot.com/23444051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222735 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display')
-rw-r--r--ash/display/mirror_window_controller.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc
index 32d3874..1a338fe 100644
--- a/ash/display/mirror_window_controller.cc
+++ b/ash/display/mirror_window_controller.cc
@@ -116,10 +116,8 @@ class CursorWindowDelegate : public aura::WindowDelegate {
return false;
}
virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {}
- virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE {
- NOTREACHED();
- return scoped_refptr<ui::Texture>();
- }
+ virtual void DidRecreateLayer(ui::Layer* old_layer,
+ ui::Layer* new_layer) OVERRIDE {}
// Set the cursor image for the |display|'s scale factor. Note that
// mirror window's scale factor is always 1.0f, therefore we need to