[Remoting Android] Move mRenderData into TouchInputHandler

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

 // Copyright 2013 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.content.Context;
+import android.graphics.Matrix;
 import android.graphics.PointF;
 import android.text.InputType;
 import android.view.MotionEvent;
 import android.view.SurfaceView;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
 
 import org.chromium.chromoting.jni.Client;
 
 /**
  * The abstract class for viewing and interacting with a specific remote host. Handles logic
  * for touch input and render data.
  */
 public abstract class DesktopView extends SurfaceView {
     /** Used to define the animation feedback shown when a user touches the screen. */
     public enum InputFeedbackType {
         NONE,
         SHORT_TOUCH_ANIMATION,
         LONG_TOUCH_ANIMATION,
         LONG_TRACKPAD_ANIMATION
     }
 
-    protected final RenderData mRenderData;
     protected final TouchInputHandler mInputHandler;
 
     /**
      * Subclass should trigger this event when the client view size is changed.
      */
     protected final Event.Raisable<SizeChangedEventParameter> mOnClientSizeChanged =
             new Event.Raisable<>();
 
     /**
      * Subclass should trigger this event when the host (desktop frame) size is changed.
      */
     protected final Event.Raisable<SizeChangedEventParameter> mOnHostSizeChanged =
             new Event.Raisable<>();
 
     private final int mTinyFeedbackPixelRadius;
     private final int mSmallFeedbackPixelRadius;
     private final int mLargeFeedbackPixelRadius;
 
     /** The parent Desktop activity. */
     private final Desktop mDesktop;
 
     private final Event.Raisable<TouchEventParameter> mOnTouch = new Event.Raisable<>();
 
     public DesktopView(Desktop desktop, Client client) {
         super(desktop);
         Preconditions.notNull(desktop);
         Preconditions.notNull(client);
         mDesktop = desktop;
-        mRenderData = new RenderData();
-        mInputHandler = new TouchInputHandler(this, desktop, mRenderData);
+        mInputHandler = new TouchInputHandler(this, desktop);
         mInputHandler.init(desktop, new InputEventSender(client));
 
         // Give this view keyboard focus, allowing us to customize the soft keyboard's settings.
         setFocusableInTouchMode(true);
 
         mTinyFeedbackPixelRadius =
                 getResources().getDimensionPixelSize(R.dimen.feedback_animation_radius_tiny);
 
         mSmallFeedbackPixelRadius =
                 getResources().getDimensionPixelSize(R.dimen.feedback_animation_radius_small);
@@ skipping 81 matching lines @@
         }
     }
 
     /** Triggers a brief animation to indicate the existence and location of an input event. */
     public abstract void showInputFeedback(InputFeedbackType feedbackToShow, PointF pos);
 
     /**
      * Informs the view that its transformation matrix (for rendering the remote desktop bitmap)
      * has been changed by the TouchInputHandler, which requires repainting.
      */
-    public abstract void transformationChanged();
+    public abstract void transformationChanged(Matrix matrix);
 
     /**
      * Informs the view that the cursor has been moved by the TouchInputHandler, which requires
      * repainting.
      */
-    public abstract void cursorMoved();
+    public abstract void cursorMoved(PointF position);
 
     /**
      * Informs the view that the cursor visibility has been changed (for different input mode) by
      * the TouchInputHandler, which requires repainting.
      */
-    public abstract void cursorVisibilityChanged();
+    public abstract void cursorVisibilityChanged(boolean visible);
 
     /**
      * Starts or stops an animation. Whilst the animation is running, the DesktopView will
      * periodically call TouchInputHandler.processAnimation() and repaint itself.
      */
     public abstract void setAnimationEnabled(boolean enabled);
 }