| Index: content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java
 | 
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java
 | 
| index 3c7f70bbfed632537eb6bbe7851df3f8718ac582..5a5232ea048915374b0f1540b0b1a9479980e0ce 100644
 | 
| --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java
 | 
| +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewRenderView.java
 | 
| @@ -18,6 +18,7 @@ import android.widget.FrameLayout;
 | 
|  import org.chromium.base.CalledByNative;
 | 
|  import org.chromium.base.JNINamespace;
 | 
|  import org.chromium.content.common.TraceEvent;
 | 
| +import org.chromium.ui.base.WindowAndroid;
 | 
|  
 | 
|  /***
 | 
|   * This view is used by a ContentView to render its content.
 | 
| @@ -53,10 +54,10 @@ public class ContentViewRenderView extends FrameLayout {
 | 
|       * Native code should add/remove the layers to be rendered through the ContentViewLayerRenderer.
 | 
|       * @param context The context used to create this.
 | 
|       */
 | 
| -    public ContentViewRenderView(Context context) {
 | 
| +    public ContentViewRenderView(Context context, WindowAndroid rootWindow) {
 | 
|          super(context);
 | 
| -
 | 
| -        mNativeContentViewRenderView = nativeInit();
 | 
| +        assert rootWindow != null;
 | 
| +        mNativeContentViewRenderView = nativeInit(rootWindow.getNativePointer());
 | 
|          assert mNativeContentViewRenderView != 0;
 | 
|  
 | 
|          setBackgroundColor(Color.WHITE);
 | 
| @@ -290,7 +291,7 @@ public class ContentViewRenderView extends FrameLayout {
 | 
|          }
 | 
|      }
 | 
|  
 | 
| -    private native int nativeInit();
 | 
| +    private native int nativeInit(long nativeRootWindow);
 | 
|      private native void nativeDestroy(int nativeContentViewRenderView);
 | 
|      private native void nativeSetCurrentContentView(int nativeContentViewRenderView,
 | 
|              int nativeContentView);
 | 
| 
 |