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 cdb125adc5285888d4f9a7df3d2b031a92d75129..2014e06a6137b44a4a520e3362d64baf35832882 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -25,6 +25,7 @@
 #include "gpu/command_buffer/common/mailbox.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
+#include "ui/base/android/window_android_observer.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/vector2d_f.h"
 
@@ -61,10 +62,9 @@ struct NativeWebKeyboardEvent;
 class RenderWidgetHostViewAndroid
     : public RenderWidgetHostViewBase,
       public BrowserAccessibilityDelegate,
-      public cc::TextureLayerClient,
-      public cc::DelegatedRendererLayerClient,
       public cc::DelegatedFrameResourceCollectionClient,
-      public ImageTransportFactoryAndroidObserver {
+      public ImageTransportFactoryAndroidObserver,
+      public ui::WindowAndroidObserver {
  public:
   RenderWidgetHostViewAndroid(RenderWidgetHostImpl* widget,
                               ContentViewCoreImpl* content_view_core);
@@ -192,19 +192,14 @@ class RenderWidgetHostViewAndroid
   virtual gfx::Point GetLastTouchEventLocation() const OVERRIDE;
   virtual void FatalAccessibilityTreeError() OVERRIDE;
 
-  // cc::TextureLayerClient implementation.
-  virtual unsigned PrepareTexture() 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;
 
+  // ui::WindowAndroidObserver implementation.
+  virtual void OnCompositingDidCommit() OVERRIDE;
+  virtual void OnAttachCompositor() OVERRIDE {}
+  virtual void OnDetachCompositor() OVERRIDE;
+
   // ImageTransportFactoryAndroidObserver implementation.
   virtual void OnLostResources() OVERRIDE;
 
@@ -272,6 +267,8 @@ class RenderWidgetHostViewAndroid
   void UpdateAnimationSize(const cc::CompositorFrameMetadata& frame_metadata);
   void ScheduleAnimationIfNecessary();
 
+  bool UsingSynchronousCompositor() const;

[no sievers, 2013/11/15 20:15:20]

remove this

[powei, 2013/11/15 22:41:28]

Done.

+
   // Called after async screenshot task completes. Scales and crops the result
   // of the copy.
   static void PrepareTextureCopyOutputResult(
@@ -345,6 +342,8 @@ class RenderWidgetHostViewAndroid
   // Size to use if we have no backing ContentViewCore
   gfx::Size default_size_;
 
+  bool using_synchronous_compositor_;
+
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);
 };