| 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 391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 , canRubberbandLeft(true) | 402 , canRubberbandLeft(true) |
| 403 , canRubberbandRight(true) | 403 , canRubberbandRight(true) |
| 404 { | 404 { |
| 405 } | 405 } |
| 406 }; | 406 }; |
| 407 | 407 |
| 408 // WebGestureEvent -------------------------------------------------------------
- | 408 // WebGestureEvent -------------------------------------------------------------
- |
| 409 | 409 |
| 410 class WebGestureEvent : public WebInputEvent { | 410 class WebGestureEvent : public WebInputEvent { |
| 411 public: | 411 public: |
| 412 enum SourceDevice { | |
| 413 Touchpad, | |
| 414 Touchscreen, | |
| 415 }; | |
| 416 | |
| 417 int x; | 412 int x; |
| 418 int y; | 413 int y; |
| 419 int globalX; | 414 int globalX; |
| 420 int globalY; | 415 int globalY; |
| 421 // TODO(rjkroege): Restore typing once chromium side lands | 416 WebGestureDevice sourceDevice; |
| 422 // (http://crbug.com/343327) | |
| 423 int sourceDevice; | |
| 424 | 417 |
| 425 union { | 418 union { |
| 426 // Tap information must be set for GestureTap, GestureTapUnconfirmed, | 419 // Tap information must be set for GestureTap, GestureTapUnconfirmed, |
| 427 // and GestureDoubleTap events. | 420 // and GestureDoubleTap events. |
| 428 struct { | 421 struct { |
| 429 int tapCount; | 422 int tapCount; |
| 430 float width; | 423 float width; |
| 431 float height; | 424 float height; |
| 432 } tap; | 425 } tap; |
| 433 | 426 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 519 , cancelable(true) | 512 , cancelable(true) |
| 520 { | 513 { |
| 521 } | 514 } |
| 522 }; | 515 }; |
| 523 | 516 |
| 524 #pragma pack(pop) | 517 #pragma pack(pop) |
| 525 | 518 |
| 526 } // namespace blink | 519 } // namespace blink |
| 527 | 520 |
| 528 #endif | 521 #endif |
| OLD | NEW |