| Index: remoting/client/ui/gesture_interpreter.h
|
| diff --git a/remoting/client/ui/gesture_interpreter.h b/remoting/client/ui/gesture_interpreter.h
|
| index 5418e624c45cd3ac93c610aca3eb76009825d010..818f8ca99a031c623b7aad4b3cdfb9d5ceb8b811 100644
|
| --- a/remoting/client/ui/gesture_interpreter.h
|
| +++ b/remoting/client/ui/gesture_interpreter.h
|
| @@ -49,6 +49,13 @@ class GestureInterpreter {
|
| // pinching) and the pan gesture still has some final velocity.
|
| void OneFingerFling(float velocity_x, float velocity_y);
|
|
|
| + // Called during a two-finger scroll (panning without pinching) gesture.
|
| + void Scroll(float x, float y, float dx, float dy);
|
| +
|
| + // Called when the user has just done a scroll gesture and the scroll gesture
|
| + // still has some final velocity.
|
| + void ScrollWithVelocity(float velocity_x, float velocity_y);
|
| +
|
| // Called to process one animation frame.
|
| void ProcessAnimations();
|
|
|
| @@ -58,6 +65,8 @@ class GestureInterpreter {
|
| private:
|
| void PanWithoutAbortAnimations(float translation_x, float translation_y);
|
|
|
| + void ScrollWithoutAbortAnimations(float dx, float dy);
|
| +
|
| void AbortAnimations();
|
|
|
| void InjectMouseClick(float x,
|
| @@ -85,6 +94,7 @@ class GestureInterpreter {
|
| bool is_dragging_mode_ = false;
|
|
|
| FlingAnimation pan_animation_;
|
| + FlingAnimation scroll_animation_;
|
|
|
| // GestureInterpreter is neither copyable nor movable.
|
| GestureInterpreter(const GestureInterpreter&) = delete;
|
|
|