| Index: third_party/WebKit/Source/platform/WebMouseEvent.cpp
|
| diff --git a/third_party/WebKit/Source/platform/WebMouseEvent.cpp b/third_party/WebKit/Source/platform/WebMouseEvent.cpp
|
| index 8e297fa165b3b6574d0b8c73e9c0f53c27a206fe..f86d540675592a4b77b402eb6cf33506bac41c0a 100644
|
| --- a/third_party/WebKit/Source/platform/WebMouseEvent.cpp
|
| +++ b/third_party/WebKit/Source/platform/WebMouseEvent.cpp
|
| @@ -17,10 +17,8 @@ WebMouseEvent::WebMouseEvent(WebInputEvent::Type type,
|
| : WebInputEvent(sizeof(WebMouseEvent), type, modifiers, timeStampSeconds),
|
| WebPointerProperties(buttonParam,
|
| WebPointerProperties::PointerType::Mouse),
|
| - x(gestureEvent.x),
|
| - y(gestureEvent.y),
|
| - globalX(gestureEvent.globalX),
|
| - globalY(gestureEvent.globalY),
|
| + position(WebFloatPoint(gestureEvent.x, gestureEvent.y)),
|
| + screenPosition(WebFloatPoint(gestureEvent.globalX, gestureEvent.globalY)),
|
| clickCount(clickCountParam) {
|
| setFrameScale(gestureEvent.frameScale());
|
| setFrameTranslate(gestureEvent.frameTranslate());
|
| @@ -31,8 +29,8 @@ WebFloatPoint WebMouseEvent::movementInRootFrame() const {
|
| }
|
|
|
| WebFloatPoint WebMouseEvent::positionInRootFrame() const {
|
| - return WebFloatPoint((x / m_frameScale) + m_frameTranslate.x,
|
| - (y / m_frameScale) + m_frameTranslate.y);
|
| + return WebFloatPoint((position.x / m_frameScale) + m_frameTranslate.x,
|
| + (position.y / m_frameScale) + m_frameTranslate.y);
|
| }
|
|
|
| WebMouseEvent WebMouseEvent::flattenTransform() const {
|
| @@ -42,8 +40,8 @@ WebMouseEvent WebMouseEvent::flattenTransform() const {
|
| }
|
|
|
| void WebMouseEvent::flattenTransformSelf() {
|
| - x = (x / m_frameScale) + m_frameTranslate.x;
|
| - y = (y / m_frameScale) + m_frameTranslate.y;
|
| + position.x = (position.x / m_frameScale) + m_frameTranslate.x;
|
| + position.y = (position.y / m_frameScale) + m_frameTranslate.y;
|
| m_frameTranslate.x = 0;
|
| m_frameTranslate.y = 0;
|
| m_frameScale = 1;
|
|
|