| Index: third_party/WebKit/public/platform/WebPointerProperties.h
|
| diff --git a/third_party/WebKit/public/platform/WebPointerProperties.h b/third_party/WebKit/public/platform/WebPointerProperties.h
|
| index 86f2960081b8227573c54db16384cacb5094edbd..27e59c44268912ee535ebd983ab9dc7d7fe9c4bf 100644
|
| --- a/third_party/WebKit/public/platform/WebPointerProperties.h
|
| +++ b/third_party/WebKit/public/platform/WebPointerProperties.h
|
| @@ -17,16 +17,6 @@ namespace blink {
|
| // WebTouchEvent and WebTouchPoint and merge this into WebPointerEvent.
|
| class WebPointerProperties {
|
| public:
|
| - WebPointerProperties()
|
| - : id(0),
|
| - force(std::numeric_limits<float>::quiet_NaN()),
|
| - tiltX(0),
|
| - tiltY(0),
|
| - tangentialPressure(0.0f),
|
| - twist(0),
|
| - button(Button::NoButton),
|
| - pointerType(PointerType::Unknown) {}
|
| -
|
| enum class Button { NoButton = -1, Left, Middle, Right, X1, X2, Eraser };
|
|
|
| enum class Buttons : unsigned {
|
| @@ -48,6 +38,26 @@ class WebPointerProperties {
|
| LastEntry = Touch // Must be the last entry in the list
|
| };
|
|
|
| + WebPointerProperties()
|
| + : id(0),
|
| + force(std::numeric_limits<float>::quiet_NaN()),
|
| + tiltX(0),
|
| + tiltY(0),
|
| + tangentialPressure(0.0f),
|
| + twist(0),
|
| + button(Button::NoButton),
|
| + pointerType(PointerType::Unknown) {}
|
| +
|
| + WebPointerProperties(Button buttonParam, PointerType pointerTypeParam)
|
| + : id(0),
|
| + force(std::numeric_limits<float>::quiet_NaN()),
|
| + tiltX(0),
|
| + tiltY(0),
|
| + tangentialPressure(0.0f),
|
| + twist(0),
|
| + button(buttonParam),
|
| + pointerType(pointerTypeParam) {}
|
| +
|
| int id;
|
|
|
| // The valid range is [0,1], with NaN meaning pressure is not supported by
|
|
|