[Remoting Android] Create Interfaces for GlDisplay

remoting/android/java/src/org/chromium/chromoting/GlDesktopView.java

 // Copyright 2016 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;
 
 import android.graphics.Matrix;
 import android.graphics.PointF;
 import android.view.SurfaceHolder;
 
 import org.chromium.chromoting.jni.Client;
 import org.chromium.chromoting.jni.GlDisplay;
 
 /**
  * The user interface for viewing and interacting with a specific remote host. Uses OpenGL to draw
  * the desktop and cursor. Should be used entirely on the UI thread.
  */
 public class GlDesktopView extends DesktopView implements SurfaceHolder.Callback {
     private final GlDisplay mDisplay;
 
     private Object mOnHostSizeChangedListenerKey;
     private Object mOnCanvasRenderedListenerKey;
 
     private Event.ParameterRunnable<Void> mProcessAnimationRunnable;
 
-    private float mScaleFactor;
-
     public GlDesktopView(GlDisplay display, Desktop desktop, Client client) {
         super(desktop, client);
         Preconditions.notNull(display);
         mDisplay = display;
+        display.setDesktopView(this);
 
         mProcessAnimationRunnable = new Event.ParameterRunnable<Void>() {
             @Override
             public void run(Void p) {
                 mInputHandler.processAnimation();
             }
         };
 
-        mScaleFactor = 0;
-
         getHolder().addCallback(this);

[Hzj_jie, 2016/08/29 22:52:51]

It looks like you are still using GlDesktopView for SurfaceHolder.Callback, will
you change to use GlDisplay directly in a coming change?

[Yuwei, 2016/08/29 23:38:21]

Yep. I plan to completely remove GlDesktopView in future changes. You can refer
to this in the design doc.

     }
 
     @Override
-    public void showInputFeedback(InputFeedbackType feedbackToShow, PointF pos) {
-        float diameter = getFeedbackRadius(feedbackToShow, mScaleFactor) * 2.0f;
-        if (diameter <= 0.0f) {
-            return;
-        }
-        mDisplay.showCursorInputFeedback(pos.x, pos.y, diameter);
+    public void showInputFeedback(RenderStub.InputFeedbackType feedbackToShow, PointF pos) {
+        mDisplay.showInputFeedback(feedbackToShow, pos);
     }
 
     @Override
     public void transformationChanged(Matrix matrix) {
-        float[] matrixArray = new float[9];
-        matrix.getValues(matrixArray);
-        mDisplay.pixelTransformationChanged(matrixArray);
-        mScaleFactor = matrix.mapRadius(1);
+        mDisplay.setTransformation(matrix);
     }
 
     @Override
     public void cursorMoved(PointF position) {
-        mDisplay.cursorPixelPositionChanged(position.x, position.y);
+        mDisplay.moveCursor(position);
     }
 
     @Override
     public void cursorVisibilityChanged(boolean visible) {
-        mDisplay.cursorVisibilityChanged(visible);
+        mDisplay.setCursorVisibility(visible);
     }
 
     @Override
     public void setAnimationEnabled(boolean enabled) {
         if (enabled && mOnCanvasRenderedListenerKey == null) {
             mOnCanvasRenderedListenerKey = mDisplay.onCanvasRendered()
                     .add(mProcessAnimationRunnable);
             mInputHandler.processAnimation();
         } else if (!enabled && mOnCanvasRenderedListenerKey != null) {
             mDisplay.onCanvasRendered().remove(mOnCanvasRenderedListenerKey);
             mOnCanvasRenderedListenerKey = null;
         }
     }
 
     @Override
     public void surfaceCreated(SurfaceHolder holder) {
         mOnHostSizeChangedListenerKey = mDisplay
                 .onHostSizeChanged().add(new Event.ParameterRunnable<SizeChangedEventParameter>() {
                     @Override
                     public void run(SizeChangedEventParameter p) {
                         mOnHostSizeChanged.raise(p);
                     }
                 });
 
-        mDisplay.surfaceCreated(holder.getSurface());
+        mDisplay.surfaceCreated(holder);
     }
 
     @Override
     public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-        mDisplay.surfaceChanged(width, height);
+        mDisplay.surfaceChanged(holder, format, width, height);
         mOnClientSizeChanged.raise(new SizeChangedEventParameter(width, height));
     }
 
     @Override
     public void surfaceDestroyed(SurfaceHolder holder) {
         // GlDisplay's life time spans to the whole session while GlDesktopView may be created and
         // destroyed for multiple times (say when the phone is rotated). It is important to remove
         // the listeners when the surface is about to be destroyed.
         if (mOnHostSizeChangedListenerKey != null) {
             mDisplay.onHostSizeChanged().remove(mOnHostSizeChangedListenerKey);
         }
         if (mOnCanvasRenderedListenerKey != null) {
             mDisplay.onCanvasRendered().remove(mOnCanvasRenderedListenerKey);
         }
-        mDisplay.surfaceDestroyed();
+        mDisplay.surfaceDestroyed(holder);
     }
 }