Add layerTreeBuildHelper to control layer tree in ContentViewRenderView

content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java

 // 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.
 
 package org.chromium.content.browser;
 
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
@@ skipping 25 matching lines @@
     private long mNativeContentViewRenderView;
     private final SurfaceHolder.Callback mSurfaceCallback;
 
     private final SurfaceView mSurfaceView;
     private final VSyncAdapter mVSyncAdapter;
 
     private int mPendingRenders;
     private int mPendingSwapBuffers;
     private boolean mNeedToRender;
 
-    private ContentView mCurrentContentView;
+    protected ContentView mCurrentContentView;

[Yaron, 2014/04/23 20:57:46]

Is this change still necessary? You haven't re-uploaded internal but I don't
think it should be

[Yusuf, 2014/04/24 00:06:03]

Yes. I will need this in extending classes to route touch events.

On 2014/04/23 20:57:46, Yaron wrote:

 
     private final Runnable mRenderRunnable = new Runnable() {
         @Override
         public void run() {
             render();
         }
     };
 
     /**
      * Constructs a new ContentViewRenderView that should be can to a view hierarchy.
@@ skipping 202 matching lines @@
     /**
      * Enter or leave overlay video mode.
      * @param enabled Whether overlay mode is enabled.
      */
     public void setOverlayVideoMode(boolean enabled) {
         int format = enabled ? PixelFormat.TRANSLUCENT : PixelFormat.OPAQUE;
         mSurfaceView.getHolder().setFormat(format);
         nativeSetOverlayVideoMode(mNativeContentViewRenderView, enabled);
     }
 
+    /**
+     *

[Yaron, 2014/04/23 20:57:46]

Update

[Yusuf, 2014/04/24 00:06:03]

Done.

+     */
+    public void setLayerTreeBuildHelper(long layerTreeBuildHelperNativePtr) {
+        nativeSetLayerTreeBuildHelper(mNativeContentViewRenderView, layerTreeBuildHelperNativePtr);
+    }
+
     @CalledByNative
     private void requestRender() {
         ContentViewCore contentViewCore = mCurrentContentView != null ?
                 mCurrentContentView.getContentViewCore() : null;
 
         boolean rendererHasFrame =
                 contentViewCore != null && contentViewCore.consumePendingRendererFrame();
 
         if (rendererHasFrame && mPendingSwapBuffers + mPendingRenders < MAX_SWAP_BUFFER_COUNT) {
             TraceEvent.instant("requestRender:now");
@@ skipping 19 matching lines @@
     }
 
     @CalledByNative
     private void onSwapBuffersCompleted() {
         TraceEvent.instant("onSwapBuffersCompleted");
 
         if (mPendingSwapBuffers == MAX_SWAP_BUFFER_COUNT && mNeedToRender) requestRender();
         if (mPendingSwapBuffers > 0) mPendingSwapBuffers--;
     }
 
-    private void render() {
+    protected void render() {
         if (mPendingRenders > 0) mPendingRenders--;
 
         // Waiting for the content view contents to be ready avoids compositing
         // when the surface texture is still empty.
         if (mCurrentContentView == null) return;
         ContentViewCore contentViewCore = mCurrentContentView.getContentViewCore();
         if (contentViewCore == null || !contentViewCore.isReady()) {
             return;
         }
 
         boolean didDraw = nativeComposite(mNativeContentViewRenderView);
         if (didDraw) {
             mPendingSwapBuffers++;
             if (mSurfaceView.getBackground() != null) {
                 post(new Runnable() {
                     @Override
                     public void run() {
                         mSurfaceView.setBackgroundResource(0);
                     }
                 });
             }
         }
     }
 
     private native long nativeInit(long rootWindowNativePointer);
     private native void nativeDestroy(long nativeContentViewRenderView);
     private native void nativeSetCurrentContentView(long nativeContentViewRenderView,
             long nativeContentView);
+    private native void nativeSetLayerTreeBuildHelper(long nativeContentViewRenderView,
+            long buildHelperNativePtr);
     private native void nativeSurfaceCreated(long nativeContentViewRenderView);
     private native void nativeSurfaceDestroyed(long nativeContentViewRenderView);
     private native void nativeSurfaceChanged(long nativeContentViewRenderView,
             int format, int width, int height, Surface surface);
     private native boolean nativeComposite(long nativeContentViewRenderView);
     private native boolean nativeCompositeToBitmap(long nativeContentViewRenderView, Bitmap bitmap);
     private native void nativeSetOverlayVideoMode(long nativeContentViewRenderView,
             boolean enabled);
 }