Chromium Code Reviews| Index: Source/core/page/EventHandler.cpp |
| diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp |
| index 598163f112aeaebe28a8de0070b9f1312ba18d1c..b95b1f66f6fd24317f10be61ab00b92a7e0cd369 100644 |
| --- a/Source/core/page/EventHandler.cpp |
| +++ b/Source/core/page/EventHandler.cpp |
| @@ -2287,11 +2287,11 @@ bool EventHandler::handleGestureLongPress(const GestureEventWithHitTestResults& |
| m_longTapShouldInvokeContextMenu = false; |
| if (m_frame->settings() && m_frame->settings()->touchDragDropEnabled() && m_frame->view()) { |
| PlatformMouseEvent mouseDownEvent(adjustedPoint, gestureEvent.globalPosition(), LeftButton, PlatformEvent::MousePressed, 1, |
| - gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey(), WTF::currentTime()); |
| + gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey(), PlatformMouseEvent::RealOrIndistinguishable, WTF::currentTime()); |
|
Rick Byers
2014/08/26 15:25:46
this should be Touch also - same argument as for t
Ignacio Solla
2014/08/26 17:30:42
Done.
|
| m_mouseDown = mouseDownEvent; |
| PlatformMouseEvent mouseDragEvent(adjustedPoint, gestureEvent.globalPosition(), LeftButton, PlatformEvent::MouseMoved, 1, |
| - gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey(), WTF::currentTime()); |
| + gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey(), PlatformMouseEvent::RealOrIndistinguishable, WTF::currentTime()); |
| HitTestRequest request(HitTestRequest::ReadOnly); |
| MouseEventWithHitTestResults mev = prepareMouseEvent(request, mouseDragEvent); |
| m_didStartDrag = false; |
| @@ -2787,7 +2787,7 @@ bool EventHandler::sendContextMenuEventForKey() |
| PlatformEvent::Type eventType = PlatformEvent::MousePressed; |
| #endif |
| - PlatformMouseEvent mouseEvent(position, globalPosition, RightButton, eventType, 1, false, false, false, false, WTF::currentTime()); |
| + PlatformMouseEvent mouseEvent(position, globalPosition, RightButton, eventType, 1, false, false, false, false, PlatformMouseEvent::RealOrIndistinguishable, WTF::currentTime()); |
| handleMousePressEvent(mouseEvent); |
| return sendContextMenuEvent(mouseEvent); |
| @@ -2801,7 +2801,7 @@ bool EventHandler::sendContextMenuEventForGesture(const GestureEventWithHitTestR |
| PlatformEvent::Type eventType = PlatformEvent::MousePressed; |
| #endif |
| - PlatformMouseEvent mouseEvent(targetedEvent.event().position(), targetedEvent.event().globalPosition(), RightButton, eventType, 1, false, false, false, false, WTF::currentTime()); |
| + PlatformMouseEvent mouseEvent(targetedEvent.event().position(), targetedEvent.event().globalPosition(), RightButton, eventType, 1, false, false, false, false, PlatformMouseEvent::RealOrIndistinguishable, WTF::currentTime()); |
|
Rick Byers
2014/08/26 15:25:46
also touch
Ignacio Solla
2014/08/26 17:30:43
Done.
|
| // To simulate right-click behavior, we send a right mouse down and then |
| // context menu event. |
| // FIXME: Send HitTestResults to avoid redundant hit tests. |
| @@ -2886,7 +2886,7 @@ void EventHandler::fakeMouseMoveEventTimerFired(Timer<EventHandler>* timer) |
| bool altKey; |
| bool metaKey; |
| PlatformKeyboardEvent::getCurrentModifierState(shiftKey, ctrlKey, altKey, metaKey); |
| - PlatformMouseEvent fakeMouseMoveEvent(m_lastKnownMousePosition, m_lastKnownMouseGlobalPosition, NoButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey, metaKey, currentTime()); |
| + PlatformMouseEvent fakeMouseMoveEvent(m_lastKnownMousePosition, m_lastKnownMouseGlobalPosition, NoButton, PlatformEvent::MouseMoved, 0, shiftKey, ctrlKey, altKey, metaKey, PlatformMouseEvent::RealOrIndistinguishable, currentTime()); |
| handleMouseMoveEvent(fakeMouseMoveEvent); |
| } |