VR: Content size incorrect when transitioning from webVR into VR Shell

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 469 matching lines @@
 
     @Override
     public void teardown() {
         shutdown();
     }
 
     @Override
     public void setWebVrModeEnabled(boolean enabled) {
         mContentVrWindowAndroid.setVSyncPaused(enabled);
         nativeSetWebVrMode(mNativeVrShell, enabled);
+
+        if (enabled) {
+            DisplayAndroid primaryDisplay = DisplayAndroid.getNonMultiDisplay(mActivity);

[mthiesse, 2017/05/27 03:11:39]

nit: Please share this logic with the other place that does this. Possibly a
setWebVrDisplaySize() function?

[billorr, 2017/05/30 18:22:16]

Done.

+            setContentCssSize(
+                    primaryDisplay.getDisplayWidth(), primaryDisplay.getDisplayHeight(), WEBVR_DPR);
+        } else {
+            setContentCssSize(DEFAULT_CONTENT_WIDTH, DEFAULT_CONTENT_HEIGHT, DEFAULT_DPR);
+        }
     }
 
     @Override
     public boolean getWebVrModeEnabled() {
         return nativeGetWebVrMode(mNativeVrShell);
     }
 
     @Override
     public FrameLayout getContainer() {
         return this;
@@ skipping 138 matching lines @@
     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);
     private native void nativeSetHistoryButtonsEnabled(
             long nativeVrShell, boolean canGoBack, boolean canGoForward);
 }