| Index: Source/core/events/EventContext.cpp
|
| diff --git a/Source/core/events/EventContext.cpp b/Source/core/events/EventContext.cpp
|
| index 5fa4d5e42a47257d7ed7599ad3fde52a77ab5704..ed40fa9f8a7f6bdfe4903a61515cf2cc3c45e5e6 100644
|
| --- a/Source/core/events/EventContext.cpp
|
| +++ b/Source/core/events/EventContext.cpp
|
| @@ -46,26 +46,28 @@ EventContext::~EventContext()
|
| {
|
| }
|
|
|
| -void EventContext::adoptEventPath(Vector<RefPtr<Node> >& nodes)
|
| +void TreeScopeEventContext::adoptEventPath(Vector<RefPtr<Node> >& nodes)
|
| {
|
| m_eventPath = StaticNodeList::adopt(nodes);
|
| }
|
|
|
| void EventContext::handleLocalEvents(Event* event) const
|
| {
|
| - if (m_touchEventContext) {
|
| - m_touchEventContext->handleLocalEvents(event);
|
| - } else if (m_relatedTarget && event->isMouseEvent()) {
|
| - toMouseEvent(event)->setRelatedTarget(m_relatedTarget.get());
|
| - } else if (m_relatedTarget && event->isFocusEvent()) {
|
| - toFocusEvent(event)->setRelatedTarget(m_relatedTarget.get());
|
| + if (touchEventContext()) {
|
| + touchEventContext()->handleLocalEvents(event);
|
| + } else if (relatedTarget()) {
|
| + if (event->isMouseEvent()) {
|
| + toMouseEvent(event)->setRelatedTarget(relatedTarget());
|
| + } else if (event->isFocusEvent()) {
|
| + toFocusEvent(event)->setRelatedTarget(relatedTarget());
|
| + }
|
| }
|
| - event->setTarget(m_target);
|
| + event->setTarget(target());
|
| event->setCurrentTarget(m_currentTarget.get());
|
| m_node->handleLocalEvents(event);
|
| }
|
|
|
| -TouchEventContext* EventContext::ensureTouchEventContext()
|
| +TouchEventContext* TreeScopeEventContext::ensureTouchEventContext()
|
| {
|
| if (!m_touchEventContext)
|
| m_touchEventContext = TouchEventContext::create();
|
| @@ -97,4 +99,18 @@ void TouchEventContext::handleLocalEvents(Event* event) const
|
| touchEvent->setChangedTouches(m_changedTouches);
|
| }
|
|
|
| +PassRefPtr<TreeScopeEventContext> TreeScopeEventContext::create(TreeScope& treeScope)
|
| +{
|
| + return adoptRef(new TreeScopeEventContext(treeScope));
|
| +}
|
| +
|
| +TreeScopeEventContext::TreeScopeEventContext(TreeScope& treeScope)
|
| + : m_treeScope(treeScope)
|
| +{
|
| +}
|
| +
|
| +TreeScopeEventContext::~TreeScopeEventContext()
|
| +{
|
| +}
|
| +
|
| }
|
|
|