Chromium Code Reviews Chromium Code Reviews
Issue 149053002:
Blink WebTouchPoint stores its location as WebFloatPoint, instead of WebPoint. (Closed)
Base URL: https://chromium.googlesource.com/chromium/blink@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 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 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/WebPoint.h" | 35 #include "../platform/WebFloatPoint.h" |
|
jamesr
2014/02/03 21:48:23
to include files from public/platform/ from within
tdresser
2014/02/04 14:46:23
That works fine when building blink level targets,
| |
| 36 | 36 |
| 37 namespace blink { | 37 namespace blink { |
| 38 | 38 |
| 39 class WebTouchPoint { | 39 class WebTouchPoint { |
| 40 public: | 40 public: |
| 41 WebTouchPoint() | 41 WebTouchPoint() |
| 42 : id(0) | 42 : id(0) |
| 43 , state(StateUndefined) | 43 , state(StateUndefined) |
| 44 , radiusX(0) | 44 , radiusX(0) |
| 45 , radiusY(0) | 45 , radiusY(0) |
| 46 , rotationAngle(0) | 46 , rotationAngle(0) |
| 47 , force(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; | 60 int id; |
| 61 State state; | 61 State state; |
| 62 WebPoint screenPosition; | 62 WebFloatPoint screenPosition; |
| 63 WebPoint position; | 63 WebFloatPoint position; |
| 64 | 64 |
| 65 int radiusX; | 65 float radiusX; |
| 66 int radiusY; | 66 float radiusY; |
| 67 float rotationAngle; | 67 float rotationAngle; |
| 68 float force; | 68 float force; |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 } // namespace blink | 71 } // namespace blink |
| 72 | 72 |
| 73 #endif | 73 #endif |
| OLD | NEW |
