Move the content-dependent RecreateLayer logic from aura::Window to RWHVA

ui/aura/window_delegate.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef UI_AURA_WINDOW_DELEGATE_H_
 #define UI_AURA_WINDOW_DELEGATE_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "ui/aura/aura_export.h"
 #include "ui/base/events/event_constants.h"
 #include "ui/base/events/event_handler.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
 class Canvas;
 class Path;
 class Point;
 class Rect;
 class Size;
 }
 
 namespace ui {
 class GestureEvent;
 class KeyEvent;
+class Layer;
 class MouseEvent;
 class Texture;
 class TouchEvent;
 }
 
 namespace aura {
 
 // Delegate interface for aura::Window.
 class AURA_EXPORT WindowDelegate : public ui::EventHandler {
  public:
@@ skipping 52 matching lines @@
   // Called from Window::HitTest to check if the window has a custom hit test
   // mask. It works similar to the views counterparts. That is, if the function
   // returns true, GetHitTestMask below will be called to get the mask.
   // Otherwise, Window will hit-test against its bounds.
   virtual bool HasHitTestMask() const = 0;
 
   // Called from Window::HitTest to retrieve hit test mask when HasHitTestMask
   // above returns true.
   virtual void GetHitTestMask(gfx::Path* mask) const = 0;
 
-  // Called from RecreateLayer() if the layer the window is associated with has
-  // an external texture.
-  virtual scoped_refptr<ui::Texture> CopyTexture() = 0;
+  // Called from RecreateLayer() after the new layer was created. old_layer is
+  // the layer that will be returned to the caller of RecreateLayer, new_layer
+  // will be the layer now used on the Window. The implementation only has to do
+  // anything if the layer has external content (SetExternalTexture /
+  // SetTextureMailbox / SetDelegatedFrame was called).
+  virtual void DidRecreateLayer(ui::Layer* old_layer, ui::Layer* new_layer) = 0;
 
  protected:
   virtual ~WindowDelegate() {}
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_DELEGATE_H_