Adding compositor callbacks to RenderWidgetHostViewAndroid

content/browser/android/content_view_core_impl.cc

 // Copyright 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/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 152 matching lines @@
       java_ref_(env, obj),
       web_contents_(static_cast<WebContentsImpl*>(web_contents)),
       root_layer_(cc::Layer::Create()),
       tab_crashed_(false),
       vsync_interval_(base::TimeDelta::FromMicroseconds(
           kDefaultVSyncIntervalMicros)),
       expected_browser_composite_time_(base::TimeDelta::FromMicroseconds(
           kDefaultVSyncIntervalMicros * kDefaultBrowserCompositeVSyncFraction)),
       view_android_(view_android),
       window_android_(window_android),
-      device_orientation_(0) {
+      device_orientation_(0),
+      compositor_(NULL) {
   CHECK(web_contents) <<
       "A ContentViewCoreImpl should be created with a valid WebContents.";
 
   // When a tab is restored (from a saved state), it does not have a renderer
   // process. We treat it like the tab is crashed. If the content is loaded
   // when the tab is shown, tab_crashed_ will be reset.
   UpdateTabCrashedFlag();
 
   // TODO(leandrogracia): make use of the hardware_accelerated argument.
 
@@ skipping 1404 matching lines @@
 }
 
 void ContentViewCoreImpl::SendOrientationChangeEventInternal() {
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
   if (rwhv)
     rwhv->UpdateScreenInfo(rwhv->GetNativeView());
 
   RenderViewHostImpl* rvhi = static_cast<RenderViewHostImpl*>(
       web_contents_->GetRenderViewHost());
   rvhi->SendOrientationChangeEvent(device_orientation_);
+
+void ContentViewCoreImpl::SetCompositor(Compositor* compositor) {
+  compositor_ = compositor;
+  if (web_contents_) {
+    // Calling SetContentViewCore triggers the call set the ContentViewCore on

[jdduke (slow), 2013/10/16 23:12:26]

Nit: "triggers the call to set"

[powei, 2013/10/19 00:05:18]

Done. Remove.

+    // RenderWidgetHostView, which also allows RenderWidgetHostView to attach
+    // itsetlf as an observer on the compositor.
+    static_cast<WebContentsViewAndroid*>(web_contents_->GetView())
+        ->SetContentViewCore(this);

[no sievers, 2013/10/16 23:34:23]

Can we avoid piggy-backing on this other function? In the past we had a lot of
problems with the complicated relationship between our objects (and unclear
roles), and this is not intuitive. Setting the compositor should have nothing to
do with setting the CVC-WC-RWHV relationship.

See my other comment - if we pass the compositor into the constructor, we don't
need to do this, right?

[powei, 2013/10/19 00:05:18]

Done.

+  }

[jdduke (slow), 2013/10/16 23:12:26]

So, the desired effect here is simply to trigger RWHVA to add/remove itself as
an observer to the Compositor? Why don't we do that directly right here
(RWHVA::SetCompositor()), instead of relying on side effects of
SetContentViewCore()? Or do we need to go through the attach/detach layers cycle
when SetCompositor() is called?

[powei, 2013/10/19 00:05:18]

Done.

 }
 
 // This is called for each ContentView.
 jint Init(JNIEnv* env, jobject obj,
           jboolean hardware_accelerated,
           jint native_web_contents,
           jint view_android,
           jint window_android) {
   ContentViewCoreImpl* view = new ContentViewCoreImpl(
       env, obj, hardware_accelerated,
       reinterpret_cast<WebContents*>(native_web_contents),
       reinterpret_cast<ui::ViewAndroid*>(view_android),
       reinterpret_cast<ui::WindowAndroid*>(window_android));
   return reinterpret_cast<jint>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
+

[powei, 2013/10/16 22:42:35]

empty lines to be removed.

[powei, 2013/10/19 00:05:18]

Done.

+
 }  // namespace content