Add layerTreeBuildHelper to control layer tree in ContentViewRenderView

content/browser/android/content_view_render_view.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/android/content_view_render_view.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/layers/layer.h"
 #include "content/browser/android/content_view_core_impl.h"
+#include "content/browser/android/layer_tree_build_helper.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/android/content_view_layer_renderer.h"
 #include "jni/ContentViewRenderView_jni.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/size.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 
 using base::android::ScopedJavaLocalRef;
 
 namespace content {
 
 // static
 bool ContentViewRenderView::RegisterContentViewRenderView(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 ContentViewRenderView::ContentViewRenderView(JNIEnv* env,
                                              jobject obj,
                                              gfx::NativeWindow root_window)
     : buffers_swapped_during_composite_(false),
+      root_layer_(cc::Layer::Create()),
+      layer_tree_build_helper_(new LayerTreeBuildHelper()),
       root_window_(root_window),
       current_surface_format_(0) {
+  root_layer_->SetIsDrawable(true);
   java_obj_.Reset(env, obj);
 }
 
 ContentViewRenderView::~ContentViewRenderView() {
 }
 
+void ContentViewRenderView::SetLayerTreeBuildHelper(JNIEnv* env,
+                                                    jobject obj,
+                                                    jlong native_build_helper) {
+  if (!native_build_helper)

[Yaron, 2014/04/10 01:26:09]

Can you CHECK this? Why can this be 0?

[Yusuf, 2014/04/23 00:16:14]

Done.

+    return;
+  LayerTreeBuildHelper* build_helper =
+      reinterpret_cast<LayerTreeBuildHelper*>(native_build_helper);
+  layer_tree_build_helper_ = build_helper;
+}
 // static
-static jlong Init(JNIEnv* env, jobject obj, jlong native_root_window) {
+static jlong Init(JNIEnv* env,
+                  jobject obj,
+                  jlong native_root_window) {
   gfx::NativeWindow root_window =
       reinterpret_cast<gfx::NativeWindow>(native_root_window);
   ContentViewRenderView* content_view_render_view =
       new ContentViewRenderView(env, obj, root_window);
   return reinterpret_cast<intptr_t>(content_view_render_view);
 }
 
 void ContentViewRenderView::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 void ContentViewRenderView::SetCurrentContentView(
     JNIEnv* env, jobject obj, jlong native_content_view) {
   InitCompositor();
   ContentViewCoreImpl* content_view =
       reinterpret_cast<ContentViewCoreImpl*>(native_content_view);
-  if (content_view)
-    compositor_->SetRootLayer(content_view->GetLayer());
-  else
-    compositor_->SetRootLayer(cc::Layer::Create());
+  root_layer_ = layer_tree_build_helper_->GetLayerTree(content_view);
 }
 
 void ContentViewRenderView::SurfaceCreated(
     JNIEnv* env, jobject obj) {
   InitCompositor();
 }
 
 void ContentViewRenderView::SurfaceDestroyed(JNIEnv* env, jobject obj) {
   compositor_->SetSurface(NULL);
   current_surface_format_ = 0;
@@ skipping 42 matching lines @@
 }
 
 void ContentViewRenderView::OnSwapBuffersCompleted() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_ContentViewRenderView_onSwapBuffersCompleted(env, java_obj_.obj());
 }
 
 void ContentViewRenderView::InitCompositor() {
   if (!compositor_)
     compositor_.reset(Compositor::Create(this, root_window_));
+  compositor_->SetRootLayer(root_layer_);

[Yaron, 2014/04/10 01:26:09]

I think this should stay in SetCurrentContentView, right after setting the root
layer.

[Yusuf, 2014/04/23 00:16:14]

Done.

 }
-
 }  // namespace content