Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: public/web/WebTouchPoint.h

Issue 1212113007: Add WebPointerProperties type. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 "WebMouseProperties.h"
37 #include "WebPointerProperties.h"
36 38
37 namespace blink { 39 namespace blink {
38 40
39 class WebTouchPoint { 41 // TODO(e_hakkinen): Replace WebTouchEvent with WebPointerEvent and remove
42 // WebTouchEvent and this.
43 class WebTouchPoint : public WebMouseProperties, public WebPointerProperties {
Rick Byers 2015/07/06 17:22:38 I was originally thinking we'd use aggregation (i.
40 public: 44 public:
41 WebTouchPoint() 45 WebTouchPoint()
42 : id(0) 46 : WebMouseProperties()
47 , WebPointerProperties()
43 , state(StateUndefined) 48 , state(StateUndefined)
44 , radiusX(0)
45 , radiusY(0)
46 , rotationAngle(0) 49 , rotationAngle(0)
47 , force(0)
48 { 50 {
49 } 51 }
50 52
51 enum State { 53 enum State {
52 StateUndefined, 54 StateUndefined,
53 StateReleased, 55 StateReleased,
54 StatePressed, 56 StatePressed,
55 StateMoved, 57 StateMoved,
56 StateStationary, 58 StateStationary,
57 StateCancelled, 59 StateCancelled,
58 }; 60 };
59 61
60 int id;
61 State state; 62 State state;
62 WebFloatPoint screenPosition; 63 WebFloatPoint screenPosition;
63 WebFloatPoint position; 64 WebFloatPoint position;
Rick Byers 2015/07/06 17:22:39 These co-ordinate properties could eventually be m
USE eero AT chromium.org 2015/07/07 10:00:56 Done.
64 65
65 float radiusX;
66 float radiusY;
Rick Byers 2015/07/06 17:22:39 You can't just replace radiusX/radiusY with width/
USE eero AT chromium.org 2015/07/07 10:00:56 Done.
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
OLDNEW
« public/web/WebPointerProperties.h ('K') | « public/web/WebPointerProperties.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698