Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(853)

Unified Diff: Source/core/events/EventDispatcher.cpp

Issue 125593005: Rename EventContext to NodeEventContext. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebased Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/events/EventDispatcher.h ('k') | Source/core/events/EventPath.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/events/EventDispatcher.cpp
diff --git a/Source/core/events/EventDispatcher.cpp b/Source/core/events/EventDispatcher.cpp
index d41487a4972546d9eefd89f561e774d880d1a78d..055273ab566bd337eee234d1b57c6bc12f1277c0 100644
--- a/Source/core/events/EventDispatcher.cpp
+++ b/Source/core/events/EventDispatcher.cpp
@@ -108,7 +108,7 @@ bool EventDispatcher::dispatch()
m_event->setTarget(EventPath::eventTargetRespectingTargetRules(m_node.get()));
ASSERT(!NoEventDispatchAssertion::isEventDispatchForbidden());
ASSERT(m_event->target());
- WindowEventContext windowEventContext(m_event.get(), m_node.get(), topEventContext());
+ WindowEventContext windowEventContext(m_event.get(), m_node.get(), topNodeEventContext());
InspectorInstrumentationCookie cookie = InspectorInstrumentation::willDispatchEvent(&m_node->document(), *m_event, windowEventContext.window(), m_node.get(), m_event->eventPath());
void* preDispatchEventHandlerResult;
@@ -143,7 +143,7 @@ inline EventDispatchContinuation EventDispatcher::dispatchEventAtCapturing(Windo
return DoneDispatching;
for (size_t i = m_event->eventPath().size() - 1; i > 0; --i) {
- const EventContext& eventContext = m_event->eventPath()[i];
+ const NodeEventContext& eventContext = m_event->eventPath()[i];
if (eventContext.currentTargetSameAsTarget())
continue;
eventContext.handleLocalEvents(m_event.get());
@@ -166,7 +166,7 @@ inline void EventDispatcher::dispatchEventAtBubbling(WindowEventContext& windowC
// Trigger bubbling event handlers, starting at the bottom and working our way up.
size_t size = m_event->eventPath().size();
for (size_t i = 1; i < size; ++i) {
- const EventContext& eventContext = m_event->eventPath()[i];
+ const NodeEventContext& eventContext = m_event->eventPath()[i];
if (eventContext.currentTargetSameAsTarget())
m_event->setEventPhase(Event::AT_TARGET);
else if (m_event->bubbles() && !m_event->cancelBubble())
@@ -217,7 +217,7 @@ inline void EventDispatcher::dispatchEventPostProcess(void* preDispatchEventHand
}
}
-const EventContext* EventDispatcher::topEventContext()
+const NodeEventContext* EventDispatcher::topNodeEventContext()
{
return m_event->eventPath().isEmpty() ? 0 : &m_event->eventPath().last();
}
« no previous file with comments | « Source/core/events/EventDispatcher.h ('k') | Source/core/events/EventPath.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698