[Remoting Android] Make JniClient own JniDisplayHandler

remoting/android/java/src/org/chromium/chromoting/cardboard/Desktop.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 static org.chromium.chromoting.cardboard.CardboardUtil.makeFloatBuffer;
 import static org.chromium.chromoting.cardboard.CardboardUtil.makeRectangularTextureBuffer;
 
 import android.graphics.Bitmap;
 import android.graphics.Point;
 import android.opengl.GLES20;
 
-import org.chromium.chromoting.jni.Client;
+import org.chromium.chromoting.jni.Display;
 
 import java.nio.FloatBuffer;
 
 /**
  * Chromoting Cardboard activity desktop, which is used to display host desktop.
  */
 public class Desktop {
     private static final String VERTEX_SHADER =
             "uniform mat4 u_CombinedMatrix;"
             + "attribute vec4 a_Position;"
@@ skipping 29 matching lines @@
 
     private static final int POSITION_DATA_SIZE = 3;
     private static final int TEXTURE_COORDINATE_DATA_SIZE = 2;
 
     // Fix the desktop height and adjust width accordingly.
     private static final float HALF_HEIGHT = 1.0f;
 
     // Number of vertices passed to glDrawArrays().
     private static final int VERTICES_NUMBER = 6;
 
-    private final Client mClient;
+    private final Display mDisplay;
 
     private int mVertexShaderHandle;
     private int mFragmentShaderHandle;
     private int mProgramHandle;
     private int mCombinedMatrixHandle;
     private int mTextureUniformHandle;
     private int mPositionHandle;
     private int mTransparentHandle;
     private int mTextureDataHandle;
     private int mTextureCoordinateHandle;
     private FloatBuffer mPosition;
     private float mHalfWidth;
 
     // Lock to allow multithreaded access to mHalfWidth.
     private final Object mHalfWidthLock = new Object();
 
     private Bitmap mVideoFrame;
 
     // Lock to allow multithreaded access to mVideoFrame.
     private final Object mVideoFrameLock = new Object();
 
     // Flag to indicate whether to reload the desktop texture.
     private boolean mReloadTexture;
 
     // Lock to allow multithreaded access to mReloadTexture.
     private final Object mReloadTextureLock = new Object();
 
-    public Desktop(Client client) {
-        mClient = client;
+    public Desktop(Display display) {
+        mDisplay = display;
         mVertexShaderHandle =
                 ShaderHelper.compileShader(GLES20.GL_VERTEX_SHADER, VERTEX_SHADER);
         mFragmentShaderHandle =
                 ShaderHelper.compileShader(GLES20.GL_FRAGMENT_SHADER, FRAGMENT_SHADER);
         mProgramHandle = ShaderHelper.createAndLinkProgram(mVertexShaderHandle,
                 mFragmentShaderHandle, new String[] {"a_Position", "a_TexCoordinate",
                     "u_CombinedMatrix", "u_Texture"});
         mCombinedMatrixHandle =
                 GLES20.glGetUniformLocation(mProgramHandle, "u_CombinedMatrix");
         mTextureUniformHandle = GLES20.glGetUniformLocation(mProgramHandle, "u_Texture");
@@ skipping 112 matching lines @@
      * so that both eyes will have the same texture.
      */
     public void maybeLoadDesktopTexture() {
         synchronized (mReloadTextureLock) {
             if (!mReloadTexture) {
                 return;
             }
         }
 
         // TODO(shichengfeng): Record the time desktop drawing takes.
-        Bitmap bitmap = mClient.getDisplay().getVideoFrame();
+        Bitmap bitmap = mDisplay.getVideoFrame();
 
         if (bitmap == null) {
             // This can happen if the client is connected, but a complete video frame has not yet
             // been decoded.
             return;
         }
 
         updateVideoFrame(bitmap);
 
         synchronized (mReloadTextureLock) {
             mReloadTexture = false;
         }
     }
 
     /**
      * Inform this object that a new video frame should be rendered.
      * Called from native display thread.
      */
     public void reloadTexture() {
         synchronized (mReloadTextureLock) {
             mReloadTexture = true;
         }
     }
 }