chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java - Issue 2626723003: Revert "Introduce ViewRoot forwarding input/view events to native"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/vr_shell/VrShellImpl.java

Issue 2626723003: Revert "Introduce ViewRoot forwarding input/view events to native" (Closed)

Patch Set: Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java ('k') | content/browser/android/content_view_core_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 47d59652794c7580512ef3572ba321554d334c34..6e0e596ffc9b1ccc523aff091fac40bdcc7839ac 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

@@ -31,7 +31,6 @@ import org.chromium.content.browser.ContentView;

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content_public.browser.WebContents;

import org.chromium.ui.base.ViewAndroidDelegate;

-import org.chromium.ui.base.ViewRoot;

import org.chromium.ui.base.WindowAndroid;

import org.chromium.ui.display.DisplayAndroid;

import org.chromium.ui.display.VirtualDisplayAndroid;

@@ -187,7 +186,7 @@ public class VrShellImpl extends GvrLayout implements VrShell, SurfaceHolder.Cal

Point size = new Point(surfaceWidth, surfaceHeight);

mUiVirtualDisplay.update(size, size, dpr, null, null, null);

mUiCVC.onSizeChanged(surfaceWidth, surfaceHeight, 0, 0);

- getViewRoot(mUiCVC).onPhysicalBackingSizeChanged(surfaceWidth, surfaceHeight);

+ mUiCVC.onPhysicalBackingSizeChanged(surfaceWidth, surfaceHeight);

nativeUIPhysicalBoundsChanged(mNativeVrShell, surfaceWidth, surfaceHeight, dpr);

}

@@ -200,14 +199,10 @@ public class VrShellImpl extends GvrLayout implements VrShell, SurfaceHolder.Cal

Point size = new Point(surfaceWidth, surfaceHeight);

mContentVirtualDisplay.update(size, size, dpr, null, null, null);

mContentCVC.onSizeChanged(surfaceWidth, surfaceHeight, 0, 0);

- getViewRoot(mContentCVC).onPhysicalBackingSizeChanged(surfaceWidth, surfaceHeight);

+ mContentCVC.onPhysicalBackingSizeChanged(surfaceWidth, surfaceHeight);

nativeContentPhysicalBoundsChanged(mNativeVrShell, surfaceWidth, surfaceHeight, dpr);

}

- private ViewRoot getViewRoot(ContentViewCore cvc) {

- return cvc.getWindowAndroid().getViewRoot();

- }

@Override

public boolean dispatchTouchEvent(MotionEvent event) {

// Normally, touch event is dispatched to presentation view only if the phone is paired with