Chromium Code Reviews| Index: remoting/android/java/src/org/chromium/chromoting/GlDesktopView.java |
| diff --git a/remoting/android/java/src/org/chromium/chromoting/GlDesktopView.java b/remoting/android/java/src/org/chromium/chromoting/GlDesktopView.java |
| index af8f6fa82976e20f2ed25d0cdd1ac5663e02b1d2..41728d34fc2d1ca6d26c35cb861b82416cd3cb3c 100644 |
| --- a/remoting/android/java/src/org/chromium/chromoting/GlDesktopView.java |
| +++ b/remoting/android/java/src/org/chromium/chromoting/GlDesktopView.java |
| @@ -23,12 +23,11 @@ public class GlDesktopView extends DesktopView implements SurfaceHolder.Callback |
| 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 |
| @@ -37,36 +36,27 @@ public class GlDesktopView extends DesktopView implements SurfaceHolder.Callback |
| } |
| }; |
| - mScaleFactor = 0; |
| - |
| getHolder().addCallback(this); |
|
Hzj_jie
2016/08/29 22:52:51
It looks like you are still using GlDesktopView fo
Yuwei
2016/08/29 23:38:21
Yep. I plan to completely remove GlDesktopView in
|
| } |
| @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 |
| @@ -91,12 +81,12 @@ public class GlDesktopView extends DesktopView implements SurfaceHolder.Callback |
| } |
| }); |
| - 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)); |
| } |
| @@ -111,6 +101,6 @@ public class GlDesktopView extends DesktopView implements SurfaceHolder.Callback |
| if (mOnCanvasRenderedListenerKey != null) { |
| mDisplay.onCanvasRendered().remove(mOnCanvasRenderedListenerKey); |
| } |
| - mDisplay.surfaceDestroyed(); |
| + mDisplay.surfaceDestroyed(holder); |
| } |
| } |