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"
@@ skipping 20 matching lines @@
   return RegisterNativesImpl(env);
 }
 
 ContentViewRenderView::ContentViewRenderView(JNIEnv* env,
                                              jobject obj,
                                              gfx::NativeWindow root_window)
     : buffers_swapped_during_composite_(false),
       root_window_(root_window),
       current_surface_format_(0) {
   java_obj_.Reset(env, obj);
+  Java_ContentViewRenderView_setNativePtr(
+      env, obj, reinterpret_cast<intptr_t>(this));
 }
 
 ContentViewRenderView::~ContentViewRenderView() {
+  JNIEnv* env = base::android::AttachCurrentThread();
+  if (java_obj_.is_null())
+    return;
+
+  Java_ContentViewRenderView_clearNativePtr(env, java_obj_.obj());
 }
 
 // static
-static jlong Init(JNIEnv* env, jobject obj, jlong native_root_window) {
+static void 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);
+  new ContentViewRenderView(env, obj, root_window);

[Yaron, 2014/03/19 19:00:12]

Hmm, this mirrors TabAndroid but it's a dangerous pattern. At a minimum, there
should be a comment why this isn't a leak (since it's not obvious) however I'd
like to see if there's another way.

 }
 
 void ContentViewRenderView::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 void ContentViewRenderView::SetCurrentContentView(
     JNIEnv* env, jobject obj, jlong native_content_view) {
   InitCompositor();
   ContentViewCoreImpl* content_view =
@@ skipping 60 matching lines @@
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_ContentViewRenderView_onSwapBuffersCompleted(env, java_obj_.obj());
 }
 
 void ContentViewRenderView::InitCompositor() {
   if (!compositor_)
     compositor_.reset(Compositor::Create(this, root_window_));
 }
 
 }  // namespace content