[Remoting Android] Make JniClient own JniDisplayHandler

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

 // Copyright 2015 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.chromoting.cardboard;
 
 import android.app.Activity;
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.opengl.GLES20;
 import android.opengl.Matrix;
 
 import com.google.vrtoolkit.cardboard.CardboardView;
 import com.google.vrtoolkit.cardboard.Eye;
 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;
 
 /**
  * Renderer for Cardboard view.
  */
 public class CardboardRenderer implements CardboardView.StereoRenderer {
     private static final String TAG = "cr.CardboardRenderer";
 
     private static final int BYTE_PER_FLOAT = 4;
@@ skipping 30 matching lines @@
     // If the user triggers the button while looking faraway, this will cause the
     // desktop to be re-positioned in the center of the view.
     private static final float FARAWAY_ANGLE_RATIO = 1.6777f;
 
     // Small number used to avoid division-overflow or other problems with
     // floating-point imprecision.
     private static final float EPSILON = 1e-5f;
 
     private final Activity mActivity;
     private final Client mClient;
+    private final Display mDisplay;
 
     private float mCameraPosition;
 
     // Lock to allow multithreaded access to mCameraPosition.
     private final Object mCameraPositionLock = new Object();
 
     private float[] mCameraMatrix;
     private float[] mViewMatrix;
     private float[] mProjectionMatrix;
 
@@ skipping 21 matching lines @@
     // Lock for eye position related operations.
     // This protects access to mEyeDesktopPosition.
     private final Object mEyeDesktopPositionLock = new Object();
 
     // Flag to indicate whether to show menu bar.
     private boolean mMenuBarVisible;
 
     public CardboardRenderer(Activity activity, Client client) {
         mActivity = activity;
         mClient = client;
+        mDisplay = (Display) client.getDisplay();
         mCameraPosition = 0.0f;
 
         mCameraMatrix = new float[16];
         mViewMatrix = new float[16];
         mProjectionMatrix = new float[16];
         mDesktopModelMatrix = new float[16];
         mDesktopCombinedMatrix = new float[16];
         mEyePointModelMatrix = new float[16];
         mEyePointCombinedMatrix = new float[16];
         mPhotosphereCombinedMatrix = new float[16];
 
         mForwardVector = new float[3];
     }
 
     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();
                         mCursor.reloadTexture();
                     }
                 });
 
-                mClient.getDisplay().redrawGraphics();
+                mDisplay.redrawGraphics();
             }
         });
     }
 
     @Override
     public void onSurfaceCreated(EGLConfig config) {
         // Set the background clear color to black.
         GLES20.glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
 
         // Use culling to remove back faces.
         GLES20.glEnable(GLES20.GL_CULL_FACE);
 
         // 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);
 
         initializeRedrawCallback();
     }
 
     @Override
     public void onSurfaceChanged(int width, int height) {
     }
@@ skipping 263 matching lines @@
             theta = Math.atan(mDesktop.getHalfWidth()
                     / (DESKTOP_POSITION_Z - mCameraPosition));
         }
 
         // Calculate current looking angle.
         double phi = Math.atan(mForwardVector[0] / mForwardVector[2]);
 
         return Math.abs(phi) > FARAWAY_ANGLE_RATIO * Math.abs(theta);
     }
 }