Adding compositor callbacks to RenderWidgetHostViewAndroid

content/browser/web_contents/web_contents_view_android.cc

Index: content/browser/web_contents/web_contents_view_android.cc
diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc
index fc27aceed052f151b53600a5f9133bba771c47d6..c62448120644213992c6c79eb4fcae9477a44a5f 100644
--- a/content/browser/web_contents/web_contents_view_android.cc
+++ b/content/browser/web_contents/web_contents_view_android.cc
@@ -12,6 +12,7 @@
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
+#include "content/public/browser/android/compositor.h"
 #include "content/public/browser/web_contents_delegate.h"
 
 namespace content {
@@ -30,8 +31,8 @@ WebContentsViewAndroid::WebContentsViewAndroid(
     WebContentsViewDelegate* delegate)
     : web_contents_(web_contents),
       content_view_core_(NULL),
-      delegate_(delegate) {
-}
+      delegate_(delegate),
+      compositor_provider_(NULL) {}
 
 WebContentsViewAndroid::~WebContentsViewAndroid() {
 }
@@ -54,6 +55,15 @@ void WebContentsViewAndroid::SetContentViewCore(
   }
 }
 
+void WebContentsViewAndroid::SetCompositorProvider(
+    CompositorProvider* compositor_provider) {
+  compositor_provider_ = compositor_provider;
+  RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
+      web_contents_->GetRenderWidgetHostView());
+  if (rwhv)
+    rwhv->SetCompositorProvider(compositor_provider_);
+}
+
 #if defined(GOOGLE_TV)
 void WebContentsViewAndroid::NotifyExternalSurface(
     int player_id, bool is_request, const gfx::RectF& rect) {
@@ -159,7 +169,7 @@ RenderWidgetHostView* WebContentsViewAndroid::CreateViewForWidget(
   // example of how this is achieved for InterstitialPages.
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host);
   RenderWidgetHostView* view = new RenderWidgetHostViewAndroid(
-      rwhi, content_view_core_);
+      rwhi, content_view_core_, compositor_provider_);
   return view;
 }