Add layerTreeBuildHelper to control layer tree in ContentViewRenderView

content/browser/android/content_view_render_view.h

Index: content/browser/android/content_view_render_view.h
diff --git a/content/browser/android/content_view_render_view.h b/content/browser/android/content_view_render_view.h
index 1830008ac157cf11428a93253476b2f960ef9e7d..b78dd29e7a067213bb7ec10498160e6bd47530f9 100644
--- a/content/browser/android/content_view_render_view.h
+++ b/content/browser/android/content_view_render_view.h
@@ -26,13 +26,14 @@ class ContentViewRenderView : public CompositorClient {
 
   // Methods called from Java via JNI -----------------------------------------
   void Destroy(JNIEnv* env, jobject obj);
-  void SetCurrentContentView(JNIEnv* env, jobject obj,
-                             jlong native_content_view);
-  void SurfaceCreated(JNIEnv* env, jobject obj);
+  virtual void SetCurrentContentView(JNIEnv* env,

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

Crossing JNI+subclasses simultaneously seems risky and something we've tried to
avoid. It's also challenging cause you're crossing repositories.

+                                     jobject obj,
+                                     jlong native_content_view);
+  virtual void SurfaceCreated(JNIEnv* env, jobject obj);
   void SurfaceDestroyed(JNIEnv* env, jobject obj);
   void SurfaceChanged(JNIEnv* env, jobject obj,
                       jint format, jint width, jint height, jobject surface);
-  jboolean Composite(JNIEnv* env, jobject obj);
+  virtual jboolean Composite(JNIEnv* env, jobject obj);
   jboolean CompositeToBitmap(JNIEnv* env, jobject obj, jobject java_bitmap);
   void SetOverlayVideoMode(JNIEnv* env, jobject obj, bool enabled);
 
@@ -41,25 +42,24 @@ class ContentViewRenderView : public CompositorClient {
   virtual void OnSwapBuffersPosted() OVERRIDE;
   virtual void OnSwapBuffersCompleted() OVERRIDE;
 
- private:
-  virtual ~ContentViewRenderView();
+ protected:
+  scoped_ptr<content::Compositor> compositor_;
 
   void InitCompositor();
+  virtual ~ContentViewRenderView();
 
+ private:
   bool buffers_swapped_during_composite_;
 
-  base::android::ScopedJavaGlobalRef<jobject> java_obj_;
+  gfx::NativeWindow root_window_;
 
-  scoped_ptr<content::Compositor> compositor_;
+  base::android::ScopedJavaGlobalRef<jobject> java_obj_;
 
-  gfx::NativeWindow root_window_;
   int current_surface_format_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView);
 };
 
-
-
 }
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_