Index: Source/core/events/MouseEvent.cpp |
diff --git a/Source/core/events/MouseEvent.cpp b/Source/core/events/MouseEvent.cpp |
index 4cec501a1809ffaac2ef1fb8ea4691b3c0e36a83..63fb1bb82f73230f24be12aedc672fdea9604fb0 100644 |
--- a/Source/core/events/MouseEvent.cpp |
+++ b/Source/core/events/MouseEvent.cpp |
@@ -49,7 +49,7 @@ PassRefPtrWillBeRawPtr<MouseEvent> MouseEvent::create(const AtomicString& type, |
return adoptRefWillBeNoop(new MouseEvent(type, initializer)); |
} |
-PassRefPtrWillBeRawPtr<MouseEvent> MouseEvent::create(const AtomicString& eventType, PassRefPtrWillBeRawPtr<AbstractView> view, const PlatformMouseEvent& event, int detail, PassRefPtrWillBeRawPtr<Node> relatedTarget) |
+PassRefPtrWillBeRawPtr<MouseEvent> MouseEvent::create(const AtomicString& eventType, PassRefPtrWillBeRawPtr<AbstractView> view, const PlatformMouseEvent& event, int detail, PassRefPtrWillBeRawPtr<Node> relatedTarget, bool derivesFromTouch) |
{ |
ASSERT(event.type() == PlatformEvent::MouseMoved || event.button() != NoButton); |
@@ -62,19 +62,19 @@ PassRefPtrWillBeRawPtr<MouseEvent> MouseEvent::create(const AtomicString& eventT |
detail, event.globalPosition().x(), event.globalPosition().y(), event.position().x(), event.position().y(), |
event.movementDelta().x(), event.movementDelta().y(), |
event.ctrlKey(), event.altKey(), event.shiftKey(), event.metaKey(), event.button(), |
- relatedTarget, nullptr, false); |
+ relatedTarget, nullptr, false, derivesFromTouch); |
} |
PassRefPtrWillBeRawPtr<MouseEvent> MouseEvent::create(const AtomicString& type, bool canBubble, bool cancelable, PassRefPtrWillBeRawPtr<AbstractView> view, |
int detail, int screenX, int screenY, int pageX, int pageY, |
int movementX, int movementY, |
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, unsigned short button, |
- PassRefPtrWillBeRawPtr<EventTarget> relatedTarget, PassRefPtrWillBeRawPtr<DataTransfer> dataTransfer, bool isSimulated) |
+ PassRefPtrWillBeRawPtr<EventTarget> relatedTarget, PassRefPtrWillBeRawPtr<DataTransfer> dataTransfer, bool isSimulated, bool derivesFromTouch) |
{ |
return adoptRefWillBeNoop(new MouseEvent(type, canBubble, cancelable, view, |
detail, screenX, screenY, pageX, pageY, |
movementX, movementY, |
- ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, dataTransfer, isSimulated)); |
+ ctrlKey, altKey, shiftKey, metaKey, button, relatedTarget, dataTransfer, isSimulated, derivesFromTouch)); |
} |
MouseEvent::MouseEvent() |
@@ -89,11 +89,11 @@ MouseEvent::MouseEvent(const AtomicString& eventType, bool canBubble, bool cance |
int movementX, int movementY, |
bool ctrlKey, bool altKey, bool shiftKey, bool metaKey, |
unsigned short button, PassRefPtrWillBeRawPtr<EventTarget> relatedTarget, |
- PassRefPtrWillBeRawPtr<DataTransfer> dataTransfer, bool isSimulated) |
+ PassRefPtrWillBeRawPtr<DataTransfer> dataTransfer, bool isSimulated, bool derivesFromTouch) |
: MouseRelatedEvent(eventType, canBubble, cancelable, view, detail, IntPoint(screenX, screenY), |
IntPoint(pageX, pageY), |
IntPoint(movementX, movementY), |
- ctrlKey, altKey, shiftKey, metaKey, isSimulated) |
+ ctrlKey, altKey, shiftKey, metaKey, isSimulated, derivesFromTouch) |
, m_button(button == (unsigned short)-1 ? 0 : button) |
, m_buttonDown(button != (unsigned short)-1) |
, m_relatedTarget(relatedTarget) |
@@ -207,9 +207,8 @@ SimulatedMouseEvent::~SimulatedMouseEvent() |
} |
SimulatedMouseEvent::SimulatedMouseEvent(const AtomicString& eventType, PassRefPtrWillBeRawPtr<AbstractView> view, PassRefPtrWillBeRawPtr<Event> underlyingEvent) |
- : MouseEvent(eventType, true, true, view, 0, 0, 0, 0, 0, |
- 0, 0, |
- false, false, false, false, 0, nullptr, nullptr, true) |
+ : MouseEvent(eventType, true, true, view, 0, 0, 0, 0, 0, 0, 0, false, false, false, false, 0, |
+ nullptr, nullptr, true, false) |
{ |
if (UIEventWithKeyState* keyStateEvent = findEventWithKeyState(underlyingEvent.get())) { |
m_ctrlKey = keyStateEvent->ctrlKey(); |