| 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 23 matching lines...) Expand all Loading... |
| 34 #include "WebCommon.h" | 34 #include "WebCommon.h" |
| 35 #include "WebFloatPoint.h" | 35 #include "WebFloatPoint.h" |
| 36 #include "WebPointerProperties.h" | 36 #include "WebPointerProperties.h" |
| 37 | 37 |
| 38 namespace blink { | 38 namespace blink { |
| 39 | 39 |
| 40 // TODO(mustaq): Unify WebTouchPoint & WebMouseEvent into WebPointerEvent. | 40 // TODO(mustaq): Unify WebTouchPoint & WebMouseEvent into WebPointerEvent. |
| 41 // crbug.com/508283 | 41 // crbug.com/508283 |
| 42 class WebTouchPoint : public WebPointerProperties { | 42 class WebTouchPoint : public WebPointerProperties { |
| 43 public: | 43 public: |
| 44 WebTouchPoint() | 44 WebTouchPoint() : WebTouchPoint(WebPointerProperties(0)) {} |
| 45 : WebPointerProperties(0), | 45 |
| 46 WebTouchPoint(WebPointerProperties web_pointer_properties) |
| 47 : WebPointerProperties(web_pointer_properties), |
| 46 state(kStateUndefined), | 48 state(kStateUndefined), |
| 47 radius_x(0), | 49 radius_x(0), |
| 48 radius_y(0), | 50 radius_y(0), |
| 49 rotation_angle(0) {} | 51 rotation_angle(0) {} |
| 50 | 52 |
| 51 void SetPositionInWidget(float x, float y) { | 53 void SetPositionInWidget(float x, float y) { |
| 52 position_in_widget_ = WebFloatPoint(x, y); | 54 position_in_widget_ = WebFloatPoint(x, y); |
| 53 } | 55 } |
| 54 | 56 |
| 55 void SetPositionInScreen(float x, float y) { | 57 void SetPositionInScreen(float x, float y) { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 69 State state; | 71 State state; |
| 70 | 72 |
| 71 float radius_x; | 73 float radius_x; |
| 72 float radius_y; | 74 float radius_y; |
| 73 float rotation_angle; | 75 float rotation_angle; |
| 74 }; | 76 }; |
| 75 | 77 |
| 76 } // namespace blink | 78 } // namespace blink |
| 77 | 79 |
| 78 #endif | 80 #endif |
| OLD | NEW |