[Remoting Android] Make JniClient own JniDisplayHandler

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

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 1947f3cd42fa4b2273c9d1ff4ef3d01530fbf6b1..2163b9c0670b7b238b890692495fefdde071132e 100644
--- a/remoting/android/java/src/org/chromium/chromoting/cardboard/CardboardRenderer.java
+++ b/remoting/android/java/src/org/chromium/chromoting/cardboard/CardboardRenderer.java
@@ -16,6 +16,7 @@ import com.google.vrtoolkit.cardboard.HeadTransform;
 import com.google.vrtoolkit.cardboard.Viewport;
 
 import org.chromium.chromoting.jni.Client;
+import org.chromium.chromoting.jni.Display;
 
 import javax.microedition.khronos.egl.EGLConfig;
 
@@ -66,6 +67,7 @@ public class CardboardRenderer implements CardboardView.StereoRenderer {
 
     private final Activity mActivity;
     private final Client mClient;
+    private final Display mDisplay;
 
     private float mCameraPosition;
 
@@ -107,6 +109,7 @@ public class CardboardRenderer implements CardboardView.StereoRenderer {
     public CardboardRenderer(Activity activity, Client client) {
         mActivity = activity;
         mClient = client;
+        mDisplay = (Display) client.getDisplay();
         mCameraPosition = 0.0f;
 
         mCameraMatrix = new float[16];
@@ -124,7 +127,7 @@ public class CardboardRenderer implements CardboardView.StereoRenderer {
     private void initializeRedrawCallback() {
         mActivity.runOnUiThread(new Runnable() {
             public void run() {
-                mClient.getDisplay().provideRedrawCallback(new Runnable() {
+                mDisplay.provideRedrawCallback(new Runnable() {
                     @Override
                     public void run() {
                         mDesktop.reloadTexture();
@@ -132,7 +135,7 @@ public class CardboardRenderer implements CardboardView.StereoRenderer {
                     }
                 });
 
-                mClient.getDisplay().redrawGraphics();
+                mDisplay.redrawGraphics();
             }
         });
     }
@@ -148,7 +151,7 @@ public class CardboardRenderer implements CardboardView.StereoRenderer {
         // Enable depth testing.
         GLES20.glEnable(GLES20.GL_DEPTH_TEST);
 
-        mDesktop = new Desktop(mClient);
+        mDesktop = new Desktop(mDisplay);
         mMenuBar = new MenuBar(mActivity);
         mPhotosphere = new Photosphere(mActivity);
         mCursor = new Cursor(mClient);