Chromium Code Reviews Chromium Code Reviews
Issue 1212113007:
Add WebPointerProperties type. (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink.git@master| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 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 15 matching lines...) Expand all Loading... | |
| 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 WebTouchPoint_h | 31 #ifndef WebTouchPoint_h |
| 32 #define WebTouchPoint_h | 32 #define WebTouchPoint_h |
| 33 | 33 |
| 34 #include "../platform/WebCommon.h" | 34 #include "../platform/WebCommon.h" |
| 35 #include "../platform/WebFloatPoint.h" | 35 #include "../platform/WebFloatPoint.h" |
| 36 #include "WebPointerProperties.h" | |
| 36 | 37 |
| 37 namespace blink { | 38 namespace blink { |
| 38 | 39 |
| 39 class WebTouchPoint { | 40 // TODO(e_hakkinen): Replace WebTouchEvent with WebPointerEvent and remove |
| 41 // WebTouchEvent and this. | |
| 42 class WebTouchPoint : public WebPointerProperties { | |
|
mustaq
2015/07/07 18:23:10
May be I am missing something, but I don't see how
| |
| 40 public: | 43 public: |
| 41 WebTouchPoint() | 44 WebTouchPoint() |
| 42 : id(0) | 45 : WebPointerProperties() |
| 43 , state(StateUndefined) | 46 , state(StateUndefined) |
| 44 , radiusX(0) | |
| 45 , radiusY(0) | |
| 46 , rotationAngle(0) | 47 , rotationAngle(0) |
| 47 , force(0) | |
| 48 { | 48 { |
| 49 } | 49 } |
| 50 | 50 |
| 51 enum State { | 51 enum State { |
| 52 StateUndefined, | 52 StateUndefined, |
| 53 StateReleased, | 53 StateReleased, |
| 54 StatePressed, | 54 StatePressed, |
| 55 StateMoved, | 55 StateMoved, |
| 56 StateStationary, | 56 StateStationary, |
| 57 StateCancelled, | 57 StateCancelled, |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 int id; | |
| 61 State state; | 60 State state; |
| 61 | |
| 62 // TODO(e_hakkinen): Move position fields to WebPointerProperties. | |
| 62 WebFloatPoint screenPosition; | 63 WebFloatPoint screenPosition; |
| 63 WebFloatPoint position; | 64 WebFloatPoint position; |
| 64 | 65 |
| 65 float radiusX; | |
| 66 float radiusY; | |
| 67 float rotationAngle; | 66 float rotationAngle; |
| 68 float force; | |
| 69 }; | 67 }; |
| 70 | 68 |
| 71 } // namespace blink | 69 } // namespace blink |
| 72 | 70 |
| 73 #endif | 71 #endif |
| OLD | NEW |
