Chromium Code Reviews| 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 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 450 accelerationRatioY(1.0f), | 450 accelerationRatioY(1.0f), |
| 451 resendingPluginId(-1), | 451 resendingPluginId(-1), |
| 452 phase(PhaseNone), | 452 phase(PhaseNone), |
| 453 momentumPhase(PhaseNone), | 453 momentumPhase(PhaseNone), |
| 454 scrollByPage(false), | 454 scrollByPage(false), |
| 455 hasPreciseScrollingDeltas(false), | 455 hasPreciseScrollingDeltas(false), |
| 456 railsMode(RailsModeFree), | 456 railsMode(RailsModeFree), |
| 457 dispatchType(Blocking) {} | 457 dispatchType(Blocking) {} |
| 458 }; | 458 }; |
| 459 | 459 |
| 460 | |
|
tdresser
2016/11/22 21:44:40
Was this intentional?
sahel
2016/11/24 15:28:55
Sorry it happened when I resolved the merge confli
| |
| 461 // WebTouchEvent -------------------------------------------------------------- | 460 // WebTouchEvent -------------------------------------------------------------- |
| 462 | 461 |
| 463 // TODO(e_hakkinen): Replace with WebPointerEvent. crbug.com/508283 | 462 // TODO(e_hakkinen): Replace with WebPointerEvent. crbug.com/508283 |
| 464 class WebTouchEvent : public WebInputEvent { | 463 class WebTouchEvent : public WebInputEvent { |
| 465 public: | 464 public: |
| 466 // Maximum number of simultaneous touches supported on | 465 // Maximum number of simultaneous touches supported on |
| 467 // Ash/Aura. | 466 // Ash/Aura. |
| 468 enum { kTouchesLengthCap = 16 }; | 467 enum { kTouchesLengthCap = 16 }; |
| 469 | 468 |
| 470 unsigned touchesLength; | 469 unsigned touchesLength; |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 495 movedBeyondSlopRegion(false), | 494 movedBeyondSlopRegion(false), |
| 496 touchStartOrFirstTouchMove(false), | 495 touchStartOrFirstTouchMove(false), |
| 497 uniqueTouchEventId(0) {} | 496 uniqueTouchEventId(0) {} |
| 498 }; | 497 }; |
| 499 | 498 |
| 500 #pragma pack(pop) | 499 #pragma pack(pop) |
| 501 | 500 |
| 502 } // namespace blink | 501 } // namespace blink |
| 503 | 502 |
| 504 #endif | 503 #endif |
| OLD | NEW |