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 672 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 683 point.pointerType = WebPointerProperties::PointerType::Touch; | 683 point.pointerType = WebPointerProperties::PointerType::Touch; |
| 684 point.id = touch->identifier(); | 684 point.id = touch->identifier(); |
| 685 point.screenPosition = touch->screenLocation(); | 685 point.screenPosition = touch->screenLocation(); |
| 686 point.position = convertAbsoluteLocationForLayoutObjectFloat( | 686 point.position = convertAbsoluteLocationForLayoutObjectFloat( |
| 687 touch->absoluteLocation(), layoutItem); | 687 touch->absoluteLocation(), layoutItem); |
| 688 point.radiusX = touch->radiusX(); | 688 point.radiusX = touch->radiusX(); |
| 689 point.radiusY = touch->radiusY(); | 689 point.radiusY = touch->radiusY(); |
| 690 point.rotationAngle = touch->rotationAngle(); | 690 point.rotationAngle = touch->rotationAngle(); |
| 691 point.force = touch->force(); | 691 point.force = touch->force(); |
| 692 point.state = state; | 692 point.state = state; |
| 693 point.pointerType = touch->pointerProperties().pointerType; | |
|
mustaq
2016/11/17 21:24:57
Need to set point.button from pointerProperties().
denniskempin
2016/11/28 19:40:48
Done.
| |
| 693 return point; | 694 return point; |
| 694 } | 695 } |
| 695 | 696 |
| 696 static unsigned indexOfTouchPointWithId(const WebTouchPoint* touchPoints, | 697 static unsigned indexOfTouchPointWithId(const WebTouchPoint* touchPoints, |
| 697 unsigned touchPointsLength, | 698 unsigned touchPointsLength, |
| 698 unsigned id) { | 699 unsigned id) { |
| 699 for (unsigned i = 0; i < touchPointsLength; ++i) { | 700 for (unsigned i = 0; i < touchPointsLength; ++i) { |
| 700 if (touchPoints[i].id == static_cast<int>(id)) | 701 if (touchPoints[i].id == static_cast<int>(id)) |
| 701 return i; | 702 return i; |
| 702 } | 703 } |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 822 break; | 823 break; |
| 823 case GestureSourceTouchscreen: | 824 case GestureSourceTouchscreen: |
| 824 sourceDevice = WebGestureDeviceTouchscreen; | 825 sourceDevice = WebGestureDeviceTouchscreen; |
| 825 break; | 826 break; |
| 826 case GestureSourceUninitialized: | 827 case GestureSourceUninitialized: |
| 827 NOTREACHED(); | 828 NOTREACHED(); |
| 828 } | 829 } |
| 829 } | 830 } |
| 830 | 831 |
| 831 } // namespace blink | 832 } // namespace blink |
| OLD | NEW |