| Index: Source/core/events/UIEvent.cpp
|
| diff --git a/Source/core/events/UIEvent.cpp b/Source/core/events/UIEvent.cpp
|
| index ad9c852c4eeea9e23caeb98164e3877925b0f24e..293679673cb82c2c55d3f448898c04c76b798849 100644
|
| --- a/Source/core/events/UIEvent.cpp
|
| +++ b/Source/core/events/UIEvent.cpp
|
| @@ -23,18 +23,24 @@
|
| #include "config.h"
|
| #include "core/events/UIEvent.h"
|
|
|
| -
|
| namespace blink {
|
|
|
| UIEvent::UIEvent()
|
| : m_detail(0)
|
| + , m_sourceDevice(InputDevice::nonTouchEventInstance())
|
| {
|
| }
|
|
|
| -UIEvent::UIEvent(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, PassRefPtrWillBeRawPtr<AbstractView> viewArg, int detailArg)
|
| +UIEvent::UIEvent(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, PassRefPtrWillBeRawPtr<AbstractView> viewArg, int detailArg, PassRefPtrWillBeRawPtr<InputDevice> sourceDeviceArg)
|
| : Event(eventType, canBubbleArg, cancelableArg)
|
| , m_view(viewArg)
|
| , m_detail(detailArg)
|
| + , m_sourceDevice(sourceDeviceArg)
|
| +{
|
| +}
|
| +
|
| +UIEvent::UIEvent(const AtomicString& eventType, bool canBubbleArg, bool cancelableArg, PassRefPtrWillBeRawPtr<AbstractView> viewArg, int detailArg)
|
| + : UIEvent(eventType, canBubbleArg, cancelableArg, viewArg, detailArg, InputDevice::nonTouchEventInstance())
|
| {
|
| }
|
|
|
| @@ -42,6 +48,7 @@ UIEvent::UIEvent(const AtomicString& eventType, const UIEventInit& initializer)
|
| : Event(eventType, initializer)
|
| , m_view(initializer.view())
|
| , m_detail(initializer.detail())
|
| + , m_sourceDevice(initializer.sourceDevice())
|
| {
|
| }
|
|
|
| @@ -49,7 +56,7 @@ UIEvent::~UIEvent()
|
| {
|
| }
|
|
|
| -void UIEvent::initUIEvent(const AtomicString& typeArg, bool canBubbleArg, bool cancelableArg, PassRefPtrWillBeRawPtr<AbstractView> viewArg, int detailArg)
|
| +void UIEvent::initUIEvent(const AtomicString& typeArg, bool canBubbleArg, bool cancelableArg, PassRefPtrWillBeRawPtr<AbstractView> viewArg, int detailArg) // , const InputDevice& sourceDeviceArg
|
| {
|
| if (dispatched())
|
| return;
|
| @@ -58,6 +65,7 @@ void UIEvent::initUIEvent(const AtomicString& typeArg, bool canBubbleArg, bool c
|
|
|
| m_view = viewArg;
|
| m_detail = detailArg;
|
| + // m_sourceDevice = ;
|
| }
|
|
|
| bool UIEvent::isUIEvent() const
|
| @@ -108,6 +116,7 @@ int UIEvent::which() const
|
| DEFINE_TRACE(UIEvent)
|
| {
|
| visitor->trace(m_view);
|
| + visitor->trace(m_sourceDevice);
|
| Event::trace(visitor);
|
| }
|
|
|
|
|