OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 10 matching lines...) Expand all Loading... |
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
24 */ | 24 */ |
25 | 25 |
26 #ifndef WebActiveWheelFlingParameters_h | 26 #ifndef WebActiveWheelFlingParameters_h |
27 #define WebActiveWheelFlingParameters_h | 27 #define WebActiveWheelFlingParameters_h |
28 | 28 |
29 #include "../platform/WebCommon.h" | 29 #include "../platform/WebCommon.h" |
30 #include "../platform/WebFloatPoint.h" | 30 #include "../platform/WebFloatPoint.h" |
| 31 #include "../platform/WebGestureDevice.h" |
31 #include "../platform/WebPoint.h" | 32 #include "../platform/WebPoint.h" |
32 #include "../platform/WebSize.h" | 33 #include "../platform/WebSize.h" |
33 #include "WebInputEvent.h" | 34 #include "WebInputEvent.h" |
34 | 35 |
35 namespace blink { | 36 namespace blink { |
36 | 37 |
37 struct WebActiveWheelFlingParameters { | 38 struct WebActiveWheelFlingParameters { |
38 WebFloatPoint delta; | 39 WebFloatPoint delta; |
39 WebPoint point; | 40 WebPoint point; |
40 WebPoint globalPoint; | 41 WebPoint globalPoint; |
41 int modifiers; | 42 int modifiers; |
42 WebGestureEvent::SourceDevice sourceDevice; | 43 // TODO(rjkroege): Restore typing once chromium side lands |
| 44 // (http://crbug.com/343327) |
| 45 int sourceDevice; |
43 WebSize cumulativeScroll; | 46 WebSize cumulativeScroll; |
44 double startTime; | 47 double startTime; |
45 | 48 |
46 WebActiveWheelFlingParameters() | 49 WebActiveWheelFlingParameters() |
47 : modifiers(0) | 50 : modifiers(0) |
48 , sourceDevice(WebGestureEvent::Touchpad) | 51 , sourceDevice(WebGestureDeviceTouchpad) |
49 , startTime(0) | 52 , startTime(0) |
50 { | 53 { |
51 } | 54 } |
52 }; | 55 }; |
53 | 56 |
54 } | 57 } |
55 | 58 |
56 #endif | 59 #endif |
OLD | NEW |