Adding compositor callbacks to RenderWidgetHostViewAndroid

content/browser/renderer_host/render_widget_host_view_android.h

Index: content/browser/renderer_host/render_widget_host_view_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index 5429e4a219ecc517fae2893f041c1f2dc4494fd8..0835de5bf88bbfa24fe5470fd21c42e2d1197d8b 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -19,6 +19,7 @@
 #include "cc/layers/texture_layer_client.h"
 #include "cc/output/begin_frame_args.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
+#include "content/browser/renderer_host/compositor_observer.h"
 #include "content/browser/renderer_host/image_transport_factory_android.h"
 #include "content/browser/renderer_host/ime_adapter_android.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
@@ -61,9 +62,8 @@ struct NativeWebKeyboardEvent;
 class RenderWidgetHostViewAndroid
     : public RenderWidgetHostViewBase,
       public BrowserAccessibilityDelegate,
-      public cc::TextureLayerClient,
-      public cc::DelegatedRendererLayerClient,
       public cc::DelegatedFrameResourceCollectionClient,
+      public CompositorObserver,
       public ImageTransportFactoryAndroidObserver {
  public:
   RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget,
@@ -188,20 +188,12 @@ class RenderWidgetHostViewAndroid
   virtual gfx::Point GetLastTouchEventLocation() const OVERRIDE;
   virtual void FatalAccessibilityTreeError() OVERRIDE;
 
-  // cc::TextureLayerClient implementation.
-  virtual unsigned PrepareTexture() OVERRIDE;
-  virtual WebKit::WebGraphicsContext3D* Context3d() OVERRIDE;
-  virtual bool PrepareTextureMailbox(
-      cc::TextureMailbox* mailbox,
-      scoped_ptr<cc::SingleReleaseCallback>* release_callback,
-      bool use_shared_memory) OVERRIDE;
-
-  // cc::DelegatedRendererLayerClient implementation.
-  virtual void DidCommitFrameData() OVERRIDE;
-
   // cc::DelegatedFrameResourceCollectionClient implementation.
   virtual void UnusedResourcesAreAvailable() OVERRIDE;
 
+  // content::CompositorObserver implementation.
+  virtual void OnCompositingDidCommit(Compositor* compositor) OVERRIDE;
+
   // ImageTransportFactoryAndroidObserver implementation.
   virtual void OnLostResources() OVERRIDE;
 
@@ -280,6 +272,9 @@ class RenderWidgetHostViewAndroid
       const base::Callback<void(bool, const SkBitmap&)>& callback,
       scoped_ptr<cc::CopyOutputResult> result);
 
+  // Detaching the RenderWidgetHostView from ContentViewCore
+  void DetachFromContentViewCore(bool check_layers_attached);
+
   // The model object.
   RenderWidgetHostImpl* host_;