Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(668)

Side by Side Diff: content/browser/renderer_host/input/synthetic_pinch_gesture.h

Issue 95153002: Make touch-based synthetic gesture take touch slop into account. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: undo pinch refactoring; get device scale factor from gfx::Screen Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_PINCH_GESTURE_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_PINCH_GESTURE_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_PINCH_GESTURE_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_PINCH_GESTURE_H_
7 7
8 #include "content/browser/renderer_host/input/synthetic_gesture.h" 8 #include "content/browser/renderer_host/input/synthetic_gesture.h"
9 #include "content/browser/renderer_host/input/synthetic_gesture_target.h" 9 #include "content/browser/renderer_host/input/synthetic_gesture_target.h"
10 #include "content/browser/renderer_host/input/synthetic_web_input_event_builders .h" 10 #include "content/browser/renderer_host/input/synthetic_web_input_event_builders .h"
11 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
12 #include "content/common/input/synthetic_pinch_gesture_params.h" 12 #include "content/common/input/synthetic_pinch_gesture_params.h"
13 #include "third_party/WebKit/public/web/WebInputEvent.h" 13 #include "third_party/WebKit/public/web/WebInputEvent.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 class CONTENT_EXPORT SyntheticPinchGesture : public SyntheticGesture { 17 class CONTENT_EXPORT SyntheticPinchGesture : public SyntheticGesture {
18 public: 18 public:
19 explicit SyntheticPinchGesture(const SyntheticPinchGestureParams& params); 19 explicit SyntheticPinchGesture(const SyntheticPinchGestureParams& params);
20 virtual ~SyntheticPinchGesture(); 20 virtual ~SyntheticPinchGesture();
21 21
22 virtual SyntheticGesture::Result ForwardInputEvents( 22 virtual SyntheticGesture::Result ForwardInputEvents(
23 const base::TimeDelta& interval, SyntheticGestureTarget* target) OVERRIDE; 23 const base::TimeDelta& interval, SyntheticGestureTarget* target) OVERRIDE;
24 24
25 private: 25 private:
26 SyntheticPinchGestureParams params_; 26 SyntheticPinchGestureParams params_;
jdduke (slow) 2013/12/02 16:29:43 I didn't realize the private vars were before the
Dominik Grewe 2013/12/02 16:42:26 Yeah, I noticed that when refactoring. I'll upload
27 float current_y_0_; 27 float current_y_0_;
28 float current_y_1_; 28 float current_y_1_;
29 float target_y_0_; 29 float target_y_0_;
30 float target_y_1_; 30 float target_y_1_;
31 bool started_; 31 bool started_;
32 SyntheticWebTouchEvent touch_event_; 32 SyntheticWebTouchEvent touch_event_;
33 33
34 SyntheticGesture::Result ForwardTouchInputEvents( 34 SyntheticGesture::Result ForwardTouchInputEvents(
35 const base::TimeDelta& interval, SyntheticGestureTarget* target); 35 const base::TimeDelta& interval, SyntheticGestureTarget* target);
36 36
37 void ForwardTouchEvent(SyntheticGestureTarget* target); 37 void ForwardTouchEvent(SyntheticGestureTarget* target);
38 38
39 void SetupCoordinates(SyntheticGestureTarget* target);
39 float GetDeltaForPointer0(const base::TimeDelta& interval) const; 40 float GetDeltaForPointer0(const base::TimeDelta& interval) const;
40 float ComputeAbsoluteRemainingDistance() const; 41 float ComputeAbsoluteRemainingDistance() const;
41 bool HasFinished() const; 42 bool HasFinished() const;
42 43
43 DISALLOW_COPY_AND_ASSIGN(SyntheticPinchGesture); 44 DISALLOW_COPY_AND_ASSIGN(SyntheticPinchGesture);
44 }; 45 };
45 46
46 } // namespace content 47 } // namespace content
47 48
48 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_PINCH_GESTURE_H_ 49 #endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_PINCH_GESTURE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698