| Index: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
|
| index f32f1b6d79369106d1125d1f95ea151ddf0ccfa6..516a1a2e5455712e45fd04af2e15b511f8277a9e 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java
|
| @@ -41,6 +41,7 @@ import org.chromium.chrome.browser.tab.TabContentViewParent;
|
| import org.chromium.content.browser.ContentView;
|
| import org.chromium.content.browser.ContentViewCore;
|
| import org.chromium.content_public.browser.WebContents;
|
| +import org.chromium.ui.base.EventHandler;
|
| import org.chromium.ui.base.ViewAndroidDelegate;
|
| import org.chromium.ui.base.WindowAndroid;
|
| import org.chromium.ui.display.DisplayAndroid;
|
| @@ -275,7 +276,7 @@ public class VrShellImpl extends GvrLayout implements GLSurfaceView.Renderer, Vr
|
| mGlSurfaceView.post(mUpdateUiBufferSize);
|
| mUiCVCContainer.setLayoutParams(new FrameLayout.LayoutParams(
|
| mUiSurfaceWidth, mUiSurfaceHeight));
|
| - mUiCVC.onPhysicalBackingSizeChanged(mUiSurfaceWidth, mUiSurfaceHeight);
|
| + getEventHandler(mUiCVC).onPhysicalBackingSizeChanged(mUiSurfaceWidth, mUiSurfaceHeight);
|
| if (mNativeVrShell == 0) return;
|
| nativeUIBoundsChanged(mNativeVrShell, mUiSurfaceWidth, mUiSurfaceHeight, dpr);
|
| }
|
| @@ -292,7 +293,8 @@ public class VrShellImpl extends GvrLayout implements GLSurfaceView.Renderer, Vr
|
| mGlSurfaceView.post(mUpdateContentBufferSize);
|
| mContentCVCContainer.setLayoutParams(new FrameLayout.LayoutParams(
|
| mContentSurfaceWidth, mContentSurfaceHeight));
|
| - mContentCVC.onPhysicalBackingSizeChanged(mContentSurfaceWidth, mContentSurfaceHeight);
|
| + getEventHandler(mContentCVC).onPhysicalBackingSizeChanged(
|
| + mContentSurfaceWidth, mContentSurfaceHeight);
|
| if (mNativeVrShell == 0) return;
|
| nativeContentBoundsChanged(mNativeVrShell, mContentSurfaceWidth, mContentSurfaceHeight,
|
| dpr);
|
| @@ -326,6 +328,10 @@ public class VrShellImpl extends GvrLayout implements GLSurfaceView.Renderer, Vr
|
| }
|
| }
|
|
|
| + private EventHandler getEventHandler(ContentViewCore cvc) {
|
| + return cvc.getWebContents().getEventHandler();
|
| + }
|
| +
|
| @Override
|
| public void onSurfaceCreated(GL10 gl, EGLConfig config) {
|
| mContentTextureHandle = createExternalTextureHandle();
|
|
|