OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 14 matching lines...) Expand all Loading... |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #ifndef WebInputEvent_h | 31 #ifndef WebInputEvent_h |
32 #define WebInputEvent_h | 32 #define WebInputEvent_h |
33 | 33 |
34 #include "../platform/WebCommon.h" | 34 #include "../platform/WebCommon.h" |
| 35 #include "../platform/WebGestureDevice.h" |
35 #include "../platform/WebRect.h" | 36 #include "../platform/WebRect.h" |
36 #include "WebTouchPoint.h" | 37 #include "WebTouchPoint.h" |
37 | 38 |
38 #include <string.h> | 39 #include <string.h> |
39 | 40 |
40 namespace blink { | 41 namespace blink { |
41 | 42 |
42 // The classes defined in this file are intended to be used with | 43 // The classes defined in this file are intended to be used with |
43 // WebWidget's handleInputEvent method. These event types are cross- | 44 // WebWidget's handleInputEvent method. These event types are cross- |
44 // platform and correspond closely to WebCore's Platform*Event classes. | 45 // platform and correspond closely to WebCore's Platform*Event classes. |
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
410 public: | 411 public: |
411 enum SourceDevice { | 412 enum SourceDevice { |
412 Touchpad, | 413 Touchpad, |
413 Touchscreen, | 414 Touchscreen, |
414 }; | 415 }; |
415 | 416 |
416 int x; | 417 int x; |
417 int y; | 418 int y; |
418 int globalX; | 419 int globalX; |
419 int globalY; | 420 int globalY; |
420 SourceDevice sourceDevice; | 421 // TODO(rjkroege): Restore typing once chromium side lands |
| 422 // (http://crbug.com/343327) |
| 423 int sourceDevice; |
421 | 424 |
422 union { | 425 union { |
423 // Tap information must be set for GestureTap, GestureTapUnconfirmed, | 426 // Tap information must be set for GestureTap, GestureTapUnconfirmed, |
424 // and GestureDoubleTap events. | 427 // and GestureDoubleTap events. |
425 struct { | 428 struct { |
426 int tapCount; | 429 int tapCount; |
427 float width; | 430 float width; |
428 float height; | 431 float height; |
429 } tap; | 432 } tap; |
430 | 433 |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
516 , cancelable(true) | 519 , cancelable(true) |
517 { | 520 { |
518 } | 521 } |
519 }; | 522 }; |
520 | 523 |
521 #pragma pack(pop) | 524 #pragma pack(pop) |
522 | 525 |
523 } // namespace blink | 526 } // namespace blink |
524 | 527 |
525 #endif | 528 #endif |
OLD | NEW |