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

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

Issue 14296003: Remove TOUCH_EVENTS and TOUCH_EVENT_TRACKING compile-time flags. (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
Index: Source/WebCore/dom/Node.cpp
diff --git a/Source/WebCore/dom/Node.cpp b/Source/WebCore/dom/Node.cpp
index d2f71269f3f6210141b41053d4a1e6e395f56e56..8e9eda8245b14fb77a52a97939a595bfb290f4f2 100644
--- a/Source/WebCore/dom/Node.cpp
+++ b/Source/WebCore/dom/Node.cpp
@@ -424,10 +424,8 @@ Node::~Node()
void Node::willBeDeletedFrom(Document* document)
{
if (hasEventTargetData()) {
-#if ENABLE(TOUCH_EVENT_TRACKING)
if (document)
document->didRemoveEventTargetNode(this);
-#endif
clearEventTargetData();
}
@@ -2330,10 +2328,8 @@ 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));
}
@@ -2392,12 +2388,10 @@ 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)
{
@@ -2521,13 +2515,9 @@ 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

Powered by Google App Engine
This is Rietveld 408576698