[Remoting Android] Move mRenderData into TouchInputHandler

remoting/android/java/src/org/chromium/chromoting/TouchInputHandler.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.graphics.Rect;
@@ skipping 160 matching lines @@
         public DesktopView.InputFeedbackType getLongPressFeedbackType() {
             return DesktopView.InputFeedbackType.NONE;
         }
 
         @Override
         public boolean isIndirectInputMode() {
             return false;
         }
     }
 
-    public TouchInputHandler(DesktopView viewer, Context context, RenderData renderData) {
+    public TouchInputHandler(DesktopView viewer, Context context) {
         mViewer = viewer;
         mContext = context;
-        mRenderData = renderData;
+        mRenderData = new RenderData();
         mDesktopCanvas = new DesktopCanvas(mViewer, mRenderData);
 
         GestureListener listener = new GestureListener();
         mScroller = new GestureDetector(context, listener, null, false);
 
         // If long-press is enabled, the gesture-detector will not emit any further onScroll
         // notifications after the onLongPress notification. Since onScroll is being used for
         // moving the cursor, it means that the cursor would become stuck if the finger were held
         // down too long.
         mScroller.setIsLongpressEnabled(false);
@@ skipping 91 matching lines @@
                             new SimulatedTouchInputStrategy(mRenderData, injector, mContext));
                 }
                 break;
 
             default:
                 // Unreachable, but required by Google Java style and findbugs.
                 assert false : "Unreached";
         }
 
         // Ensure the cursor state is updated appropriately.
-        mViewer.cursorVisibilityChanged();
+        mViewer.cursorVisibilityChanged(mRenderData.drawCursor);
     }
 
     private void handleSystemUiVisibilityChanged(
             SystemUiVisibilityChangedEventParameter parameter) {
         if (parameter.softInputMethodVisible) {
             mDesktopCanvas.setSystemUiOffsetValues(parameter.left, parameter.top,
                     mRenderData.screenWidth - parameter.right,
                     mRenderData.screenHeight - parameter.bottom);
         } else {
             mDesktopCanvas.setSystemUiOffsetValues(0, 0, 0, 0);
@@ skipping 28 matching lines @@
                 mTotalMotionY = 0;
                 break;
 
             default:
                 break;
         }
         return handled;
     }
 
     private void handleClientSizeChanged(int width, int height) {
+        mRenderData.screenWidth = width;
+        mRenderData.screenHeight = height;
+
         mPanGestureBounds = new Rect(
                 mEdgeSlopInPx, mEdgeSlopInPx, width - mEdgeSlopInPx, height - mEdgeSlopInPx);
         resizeImageToFitScreen();
     }
 
     private void handleHostSizeChanged(int width, int height) {
+        mRenderData.imageWidth = width;
+        mRenderData.imageHeight = height;
+
         resizeImageToFitScreen();
     }
 
     private void resizeImageToFitScreen() {
         mDesktopCanvas.resizeImageToFitScreen();
 
         float screenCenterX = (float) mRenderData.screenWidth / 2;
         float screenCenterY = (float) mRenderData.screenHeight / 2;
 
         float[] imagePoint = mapScreenPointToImagePoint(screenCenterX, screenCenterY);
@@ skipping 41 matching lines @@
         moveCursor(imagePoint[0], imagePoint[1]);
     }
 
     /** Moves the cursor to the specified position on the remote host. */
     private void moveCursor(float newX, float newY) {
         boolean cursorMoved = mRenderData.setCursorPosition(newX, newY);
         if (cursorMoved) {
             mInputStrategy.injectCursorMoveEvent((int) newX, (int) newY);
         }
 
-        mViewer.cursorMoved();
+        mViewer.cursorMoved(mRenderData.getCursorPosition());
     }
 
     /** Processes a (multi-finger) swipe gesture. */
     private boolean onSwipe() {
         if (mTotalMotionY > mSwipeThreshold) {
             // Swipe down occurred.
             mViewer.showActionBar();
         } else if (mTotalMotionY < -mSwipeThreshold) {
             // Swipe up occurred.
             mViewer.showKeyboard();
@@ skipping 213 matching lines @@
             float[] mappedPoints = mapScreenPointToImagePoint(screenX, screenY);
 
             float imageWidth = (float) mRenderData.imageWidth + EPSILON;
             float imageHeight = (float) mRenderData.imageHeight + EPSILON;
 
             return mappedPoints[0] < -EPSILON || mappedPoints[0] > imageWidth
                     || mappedPoints[1] < -EPSILON || mappedPoints[1] > imageHeight;
         }
     }
 }