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

Unified Diff: Source/core/dom/Node.cpp

Issue 14280004: Revert removal of events (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 8 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/dom/Node.h ('k') | Source/core/dom/Touch.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Node.cpp
diff --git a/Source/core/dom/Node.cpp b/Source/core/dom/Node.cpp
index dc2594cf933affd9088e5736c14833686431476a..6d68e14e2ae863463fafb6dcc65736c50a4ff087 100644
--- a/Source/core/dom/Node.cpp
+++ b/Source/core/dom/Node.cpp
@@ -422,8 +422,10 @@ Node::~Node()
void Node::willBeDeletedFrom(Document* document)
{
if (hasEventTargetData()) {
+#if ENABLE(TOUCH_EVENT_TRACKING)
if (document)
document->didRemoveEventTargetNode(this);
+#endif
clearEventTargetData();
}
@@ -2367,8 +2369,10 @@ bool Node::dispatchEvent(PassRefPtr<Event> event)
{
if (event->isMouseEvent())
return EventDispatcher::dispatchEvent(this, MouseEventDispatchMediator::create(adoptRef(toMouseEvent(event.leakRef())), MouseEventDispatchMediator::SyntheticMouseEvent));
+#if ENABLE(TOUCH_EVENTS)
if (event->isTouchEvent())
return dispatchTouchEvent(adoptRef(toTouchEvent(event.leakRef())));
+#endif
return EventDispatcher::dispatchEvent(this, EventDispatchMediator::create(event));
}
@@ -2427,10 +2431,12 @@ bool Node::dispatchGestureEvent(const PlatformGestureEvent& event)
return EventDispatcher::dispatchEvent(this, GestureEventDispatchMediator::create(gestureEvent));
}
+#if ENABLE(TOUCH_EVENTS)
bool Node::dispatchTouchEvent(PassRefPtr<TouchEvent> event)
{
return EventDispatcher::dispatchEvent(this, TouchEventDispatchMediator::create(event));
}
+#endif
void Node::dispatchSimulatedClick(Event* underlyingEvent, SimulatedClickMouseEventOptions eventOptions, SimulatedClickVisualOptions visualOptions)
{
@@ -2552,9 +2558,13 @@ bool Node::willRespondToMouseClickEvents()
bool Node::willRespondToTouchEvents()
{
+#if ENABLE(TOUCH_EVENTS)
if (isDisabledFormControl(this))
return false;
return hasEventListeners(eventNames().touchstartEvent) || hasEventListeners(eventNames().touchmoveEvent) || hasEventListeners(eventNames().touchcancelEvent) || hasEventListeners(eventNames().touchendEvent);
+#else
+ return false;
+#endif
}
// This is here for inlining
« no previous file with comments | « Source/core/dom/Node.h ('k') | Source/core/dom/Touch.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698