Adding compositor callbacks to RenderWidgetHostViewAndroid

content/shell/android/java/src/org/chromium/content_shell/ShellManager.java

 // 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.
 
 package org.chromium.content_shell;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.FrameLayout;
@@ skipping 19 matching lines @@
 
     // The target for all content rendering.
     private ContentViewRenderView mContentViewRenderView;
 
     /**
      * Constructor for inflating via XML.
      */
     public ShellManager(Context context, AttributeSet attrs) {
         super(context, attrs);
         nativeInit(this);
-        mContentViewRenderView = new ContentViewRenderView(context) {
+    }
+
+    /**
+     * @param window The window used to generate all shells.
+     */
+    public void setWindow(WindowAndroid window) {
+        assert window != null;
+        mWindow = window;
+        mContentViewRenderView = new ContentViewRenderView(getContext(), window) {
             @Override
             protected void onReadyToRender() {
                 if (sStartup) {
                     mActiveShell.loadUrl(mStartupUrl);
                     sStartup = false;
                 }
             }
         };
     }
 
     /**
-     * @param window The window used to generate all shells.
-     */
-    public void setWindow(WindowAndroid window) {
-        mWindow = window;
-    }
-
-    /**
      * @return The window used to generate all shells.
      */
     public WindowAndroid getWindow() {
         return mWindow;
     }
 
     /**
      * Sets the startup URL for new shell windows.
      */
     public void setStartupUrl(String url) {
@@ skipping 11 matching lines @@
      * Creates a new shell pointing to the specified URL.
      * @param url The URL the shell should load upon creation.
      */
     public void launchShell(String url) {
         nativeLaunchShell(url);
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
     private Object createShell() {
+        assert mContentViewRenderView != null;
         LayoutInflater inflater =
                 (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         Shell shellView = (Shell) inflater.inflate(R.layout.shell_view, null);
         shellView.setWindow(mWindow);
 
         if (mActiveShell != null) closeShell(mActiveShell);
 
         shellView.setContentViewRenderView(mContentViewRenderView);
         addView(shellView, new FrameLayout.LayoutParams(
                 FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
@@ skipping 14 matching lines @@
         ContentView contentView = shellView.getContentView();
         if (contentView != null) contentView.onHide();
         shellView.setContentViewRenderView(null);
         shellView.setWindow(null);
         removeView(shellView);
     }
 
     private static native void nativeInit(Object shellManagerInstance);
     private static native void nativeLaunchShell(String url);
 }