remoting/android/java/src/org/chromium/chromoting/cardboard/CardboardRenderer.java - Issue 2132883002: [Remoting Android] Placeholder for DesktopView

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: remoting/android/java/src/org/chromium/chromoting/cardboard/CardboardRenderer.java

Issue 2132883002: [Remoting Android] Placeholder for DesktopView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase ToT and do same fix for GlDisplay Created 4 years, 5 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

« remoting/android/java/src/org/chromium/chromoting/DesktopView.java ('K') | « remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.java ('k') | remoting/android/java/src/org/chromium/chromoting/cardboard/Cursor.java » ('j') | remoting/android/java/src/org/chromium/chromoting/jni/Client.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: remoting/android/java/src/org/chromium/chromoting/cardboard/CardboardRenderer.java

diff --git a/remoting/android/java/src/org/chromium/chromoting/cardboard/CardboardRenderer.java b/remoting/android/java/src/org/chromium/chromoting/cardboard/CardboardRenderer.java

index 2163b9c0670b7b238b890692495fefdde071132e..72cc570b2aff5b080297384e79a2c1b7983647b1 100644

--- a/remoting/android/java/src/org/chromium/chromoting/cardboard/CardboardRenderer.java

+++ b/remoting/android/java/src/org/chromium/chromoting/cardboard/CardboardRenderer.java

@@ -106,10 +106,10 @@ public class CardboardRenderer implements CardboardView.StereoRenderer {

// Flag to indicate whether to show menu bar.

private boolean mMenuBarVisible;

- public CardboardRenderer(Activity activity, Client client) {

+ public CardboardRenderer(Activity activity, Client client, Display display) {

mActivity = activity;

mClient = client;

- mDisplay = (Display) client.getDisplay();

+ mDisplay = display;

mCameraPosition = 0.0f;

mCameraMatrix = new float[16];

@@ -154,7 +154,7 @@ public class CardboardRenderer implements CardboardView.StereoRenderer {

mDesktop = new Desktop(mDisplay);

mMenuBar = new MenuBar(mActivity);

mPhotosphere = new Photosphere(mActivity);

- mCursor = new Cursor(mClient);

+ mCursor = new Cursor(mClient, mDisplay);

initializeRedrawCallback();

}