[Remoting Android] Move mRenderData into TouchInputHandler

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;
 
         mProcessAnimationRunnable = new Event.ParameterRunnable<Void>() {
             @Override
             public void run(Void p) {
                 mInputHandler.processAnimation();
             }
         };
 
+        mScaleFactor = 0;
+
         getHolder().addCallback(this);
     }
 
     @Override
     public void showInputFeedback(InputFeedbackType feedbackToShow, PointF pos) {
-        float scaleFactor = mRenderData.transform.mapRadius(1);
-        float diameter = getFeedbackRadius(feedbackToShow, scaleFactor) * 2.0f;
+        float diameter = getFeedbackRadius(feedbackToShow, mScaleFactor) * 2.0f;
         if (diameter <= 0.0f) {
             return;
         }
         mDisplay.showCursorInputFeedback(pos.x, pos.y, diameter);
     }
 
     @Override
-    public void transformationChanged() {
-        if (mRenderData.imageHeight == 0 || mRenderData.imageWidth == 0

[Yuwei, 2016/08/25 21:32:28]

Just removed this check since it doesn't look useful.

The combined transformation in GPU is transformation * position / view_size, and
nothing will be drawn if either the transformation or the view size is not set.

[joedow, 2016/08/25 22:57:47]

The reason this existed was that there used to be a codepath which could call
this method before the screen or image size were set and that would result in a
divide by zero.  I'm ok removing the check, but you might want to wait until
after the branchpoint to check this in just to be safe.

[Yuwei, 2016/08/25 23:14:35]

Acknowledged.

-                || mRenderData.screenHeight == 0 || mRenderData.screenWidth == 0) {
-            return;
-        }
-        float[] matrix = new float[9];
-        mRenderData.transform.getValues(matrix);
-        mDisplay.pixelTransformationChanged(matrix);
+    public void transformationChanged(Matrix matrix) {
+        float[] matrixArray = new float[9];
+        matrix.getValues(matrixArray);
+        mDisplay.pixelTransformationChanged(matrixArray);
+        mScaleFactor = matrix.mapRadius(1);
     }
 
     @Override
-    public void cursorMoved() {
-        PointF cursorPosition = mRenderData.getCursorPosition();
-        mDisplay.cursorPixelPositionChanged(cursorPosition.x, cursorPosition.y);
+    public void cursorMoved(PointF position) {
+        mDisplay.cursorPixelPositionChanged(position.x, position.y);
     }
 
     @Override
-    public void cursorVisibilityChanged() {
-        mDisplay.cursorVisibilityChanged(mRenderData.drawCursor);
+    public void cursorVisibilityChanged(boolean visible) {
+        mDisplay.cursorVisibilityChanged(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

[Hzj_jie, 2016/08/25 21:55:14]

Since GlDisplay and GlDesktopView are the only components, I suggest to remove
onHostSizeChanged() from DesktopView, and add it into Display class. So you do
not need to forward this event.

[Yuwei, 2016/08/25 22:22:49]

Yep. That's what I am planning to do. I'm planning to add an interface called
RenderCallback to GlDisplay and make it handle on*SizeChanged and
onCanvasRendered events.

                 .onHostSizeChanged().add(new Event.ParameterRunnable<SizeChangedEventParameter>() {
                     @Override
                     public void run(SizeChangedEventParameter p) {
-                        mRenderData.imageHeight = p.height;
-                        mRenderData.imageWidth = p.width;
-
-                        // Note that imageHeight and imageWidth must be set before
-                        // mOnHostSizeChanged is triggered. mInputHandler expects the image size in
-                        // mRenderData updated before its callback is called.
                         mOnHostSizeChanged.raise(p);
                     }
                 });
 
         mDisplay.surfaceCreated(holder.getSurface());
     }
 
     @Override
     public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-        mRenderData.screenWidth = width;
-        mRenderData.screenHeight = height;
-
         mDisplay.surfaceChanged(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();
     }
 }