Add layerTreeBuildHelper to control layer tree in ContentViewRenderView

content/browser/android/content_view_render_view.h

 // 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_
 
 #include "base/android/jni_helper.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/android/compositor_client.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace content {
 class Compositor;
 
 class ContentViewRenderView : public CompositorClient {
  public:
   // Registers the JNI methods for ContentViewRender.
   static bool RegisterContentViewRenderView(JNIEnv* env);
 
   ContentViewRenderView(JNIEnv* env,
                         jobject obj,
                         gfx::NativeWindow root_window);
 
   // Methods called from Java via JNI -----------------------------------------
   void Destroy(JNIEnv* env, jobject obj);
-  void SetCurrentContentView(JNIEnv* env, jobject obj,
+  virtual void SetCurrentContentView(JNIEnv* env, jobject obj,
                              jlong native_content_view);

[David Trainor- moved to gerrit, 2014/03/18 18:33:28]

Fix indenting

[Yusuf, 2014/03/19 17:35:09]

Done.

-  void SurfaceCreated(JNIEnv* env, jobject obj);
+  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);
 
   // CompositorClient ---------------------------------------------------------
   virtual void ScheduleComposite() OVERRIDE;
   virtual void OnSwapBuffersPosted() OVERRIDE;
   virtual void OnSwapBuffersCompleted() OVERRIDE;
-
- private:
-  virtual ~ContentViewRenderView();
+ protected:

[David Trainor- moved to gerrit, 2014/03/18 18:33:28]

New line before protected

[Yusuf, 2014/03/19 17:35:09]

Done.

+  scoped_ptr<content::Compositor> compositor_;
 
   void InitCompositor();
+  virtual ~ContentViewRenderView();
+ private:

[David Trainor- moved to gerrit, 2014/03/18 18:33:28]

New line before private

[Yusuf, 2014/03/19 17:35:09]

Done.

+  bool buffers_swapped_during_composite_;
 
-  bool buffers_swapped_during_composite_;
+  gfx::NativeWindow root_window_;
 
   base::android::ScopedJavaGlobalRef<jobject> java_obj_;
 
-  scoped_ptr<content::Compositor> compositor_;
-
-  gfx::NativeWindow root_window_;
   int current_surface_format_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewRenderView);
 };
 
-
-
 }
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_RENDER_VIEW_H_