Implement lazy initialization for VrShellDelegate

chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java

 // Copyright 2016 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.chrome.browser.vr_shell;
 
 import android.annotation.SuppressLint;
 import android.graphics.Canvas;
 import android.graphics.Point;
 import android.os.StrictMode;
@@ skipping 11 matching lines @@
 import org.chromium.base.CommandLine;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.ChromeVersionInfo;
 import org.chromium.chrome.browser.NativePage;
 import org.chromium.chrome.browser.WebContentsFactory;
-import org.chromium.chrome.browser.compositor.CompositorViewHolder;
 import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabObserver;
 import org.chromium.chrome.browser.tab.TabRedirectHandler;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelSelectorObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
@@ skipping 29 matching lines @@
     // text too small to read.
     private static final float DEFAULT_CONTENT_WIDTH = 960f;
     private static final float DEFAULT_CONTENT_HEIGHT = 640f;
     // Temporary values that will be changed when the UI loads and figures out how what size it
     // needs to be.
     private static final float DEFAULT_UI_WIDTH = 1920f;
     private static final float DEFAULT_UI_HEIGHT = 1080f;
 
     private final ChromeActivity mActivity;
     private final VrShellDelegate mDelegate;
-    private final CompositorViewHolder mCompositorViewHolder;
     private final VirtualDisplayAndroid mContentVirtualDisplay;
     private final VirtualDisplayAndroid mUiVirtualDisplay;
     private final TabRedirectHandler mTabRedirectHandler;
     private final TabObserver mTabObserver;
     private final TabModelSelectorObserver mTabModelSelectorObserver;
     private final View.OnTouchListener mTouchListener;
     private TabModelSelectorTabObserver mTabModelSelectorTabObserver;
 
     private long mNativeVrShell;
 
@@ skipping 16 matching lines @@
     private boolean mReprojectedRendering;
 
     private TabRedirectHandler mNonVrTabRedirectHandler;
     private TabModelSelector mTabModelSelector;
     private float mLastContentWidth;
     private float mLastContentHeight;
     private float mLastContentDpr;
 
     private MotionEventSynthesizer mMotionEventSynthesizer;
 
-    public VrShellImpl(ChromeActivity activity, VrShellDelegate delegate,
-            CompositorViewHolder compositorViewHolder) {
+    public VrShellImpl(
+            ChromeActivity activity, VrShellDelegate delegate, TabModelSelector tabModelSelector) {
         super(activity);
         mActivity = activity;
         mDelegate = delegate;
-        mCompositorViewHolder = compositorViewHolder;
-        mTabModelSelector = mCompositorViewHolder.detachForVR();
+        mTabModelSelector = tabModelSelector;
         mUiCVCContainer = new FrameLayout(getContext()) {
             @Override
             public boolean dispatchTouchEvent(MotionEvent event) {
                 return true;
             }
         };
         addView(mUiCVCContainer, 0, new FrameLayout.LayoutParams(0, 0));
 
         mReprojectedRendering = setAsyncReprojectionEnabled(true);
         if (mReprojectedRendering) {
@@ skipping 342 matching lines @@
             mNativeVrShell = 0;
         }
         mTabModelSelector.removeObserver(mTabModelSelectorObserver);
         mTabModelSelectorTabObserver.destroy();
         mTab.removeObserver(mTabObserver);
         restoreTabFromVR();
         mUiContents.destroy();
         mContentVirtualDisplay.destroy();
         mUiVirtualDisplay.destroy();
         super.shutdown();
-        mCompositorViewHolder.onExitVR(mTabModelSelector);
     }
 
     @Override
     public void pause() {
         onPause();
     }
 
     @Override
     public void resume() {
         onResume();
@@ skipping 118 matching lines @@
             float dpr);
     private native void nativeSetWebVrMode(long nativeVrShell, boolean enabled);
     private native void nativeOnTabListCreated(long nativeVrShell, Tab[] mainTabs,
             Tab[] incognitoTabs);
     private native void nativeOnTabUpdated(long nativeVrShell, boolean incognito, int id,
             String title);
     private native void nativeOnTabRemoved(long nativeVrShell, boolean incognito, int id);
     private native Surface nativeTakeContentSurface(long nativeVrShell);
     private native void nativeRestoreContentSurface(long nativeVrShell);
 }