Adding compositor callbacks to RenderWidgetHostViewAndroid

content/browser/web_contents/web_contents_view_android.cc

 // 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.
 
 #include "content/browser/web_contents/web_contents_view_android.h"
 
 #include "base/logging.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/media/android/browser_media_player_manager.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #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/interstitial_page_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 {
 WebContentsViewPort* CreateWebContentsView(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate,
     RenderViewHostDelegateView** render_view_host_delegate_view) {
   WebContentsViewAndroid* rv = new WebContentsViewAndroid(
       web_contents, delegate);
   *render_view_host_delegate_view = rv;
   return rv;
 }
 
 WebContentsViewAndroid::WebContentsViewAndroid(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate)
     : web_contents_(web_contents),
       content_view_core_(NULL),
-      delegate_(delegate) {
+      delegate_(delegate),
+      compositor_(NULL) {
 }
 
 WebContentsViewAndroid::~WebContentsViewAndroid() {
 }
 
 void WebContentsViewAndroid::SetContentViewCore(
     ContentViewCoreImpl* content_view_core) {
   content_view_core_ = content_view_core;
   RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
       web_contents_->GetRenderWidgetHostView());
   if (rwhv)
     rwhv->SetContentViewCore(content_view_core_);
 
   if (web_contents_->ShowingInterstitialPage()) {
     rwhv = static_cast<RenderWidgetHostViewAndroid*>(
         static_cast<InterstitialPageImpl*>(
             web_contents_->GetInterstitialPage())->
                 GetRenderViewHost()->GetView());
     if (rwhv)
       rwhv->SetContentViewCore(content_view_core_);
   }
 }
 
+void WebContentsViewAndroid::SetCompositor(Compositor* compositor) {
+  compositor_ = compositor;
+  RenderWidgetHostViewAndroid* rwhv = static_cast<RenderWidgetHostViewAndroid*>(
+      web_contents_->GetRenderWidgetHostView());
+
+  if (rwhv)
+    rwhv->SetCompositor(compositor_);
+}
+
 #if defined(GOOGLE_TV)
 void WebContentsViewAndroid::NotifyExternalSurface(
     int player_id, bool is_request, const gfx::RectF& rect) {
   if (content_view_core_)
     content_view_core_->NotifyExternalSurface(player_id, is_request, rect);
 }
 #endif
 
 gfx::NativeView WebContentsViewAndroid::GetNativeView() const {
   return content_view_core_ ? content_view_core_->GetViewAndroid() : NULL;
@@ skipping 84 matching lines @@
     // making special ones (which go along with the special views).
     DCHECK(RenderViewHostFactory::has_factory());
     return render_widget_host->GetView();
   }
   // Note that while this instructs the render widget host to reference
   // |native_view_|, this has no effect without also instructing the
   // native view (i.e. ContentView) how to obtain a reference to this widget in
   // order to paint it. See ContentView::GetRenderWidgetHostViewAndroid for an
   // example of how this is achieved for InterstitialPages.
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(render_widget_host);
-  RenderWidgetHostView* view = new RenderWidgetHostViewAndroid(
+  RenderWidgetHostViewAndroid* view = new RenderWidgetHostViewAndroid(
       rwhi, content_view_core_);
+  view->SetCompositor(compositor_);

[David Trainor- moved to gerrit, 2013/10/21 15:26:08]

Was there one other code path to build a RWHVA?

[powei, 2013/11/08 21:34:47]

No, but there is a path where RWHVA is created before the compositor (or now the
CompositorProvider) is set for WebContentsViewAndroid.

   return view;
 }
 
 RenderWidgetHostView* WebContentsViewAndroid::CreateViewForPopupWidget(
     RenderWidgetHost* render_widget_host) {
   return RenderWidgetHostViewPort::CreateViewForWidget(render_widget_host);
 }
 
 void WebContentsViewAndroid::RenderViewCreated(RenderViewHost* host) {
 }
@@ skipping 45 matching lines @@
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void WebContentsViewAndroid::TakeFocus(bool reverse) {
   if (web_contents_->GetDelegate() &&
       web_contents_->GetDelegate()->TakeFocus(web_contents_, reverse))
     return;
   web_contents_->GetRenderWidgetHostView()->Focus();
 }
 
 } // namespace content