diff options
| author | Ben Murdoch <benm@google.com> | 2010-01-07 16:20:05 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-01-20 10:33:01 +0000 |
| commit | f5306da72ab6bb63f7ae07371e687f72a75c2fb2 (patch) | |
| tree | 34c3ada7bea43cd10fd036aad91a9bf2e7dbdc2d /WebCore/bindings/js | |
| parent | efd3d8ad1e5b1af7b31f8a9569df0b8568cdb52b (diff) | |
| download | external_webkit-f5306da72ab6bb63f7ae07371e687f72a75c2fb2.zip external_webkit-f5306da72ab6bb63f7ae07371e687f72a75c2fb2.tar.gz external_webkit-f5306da72ab6bb63f7ae07371e687f72a75c2fb2.tar.bz2 | |
Refactor our touch event code to use the version submitted to webkit.org by the Qt team.
Change-Id: I2953472cee68aadf18f9dd740e9b3f69ad729cf0
Diffstat (limited to 'WebCore/bindings/js')
| -rw-r--r-- | WebCore/bindings/js/JSEventCustom.cpp | 4 | ||||
| -rw-r--r-- | WebCore/bindings/js/ScriptController.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/bindings/js/JSEventCustom.cpp b/WebCore/bindings/js/JSEventCustom.cpp index 7b951bd..04ceec5 100644 --- a/WebCore/bindings/js/JSEventCustom.cpp +++ b/WebCore/bindings/js/JSEventCustom.cpp @@ -78,7 +78,7 @@ #include "SVGZoomEvent.h" #endif -#if ENABLE(TOUCH_EVENTS) // Android +#if ENABLE(TOUCH_EVENTS) #include "JSTouchEvent.h" #include "TouchEvent.h" #endif @@ -118,7 +118,7 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, Event* event) #endif else if (event->isCompositionEvent()) wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, CompositionEvent, event); -#if ENABLE(TOUCH_EVENTS) // Android +#if ENABLE(TOUCH_EVENTS) else if (event->isTouchEvent()) wrapper = CREATE_DOM_OBJECT_WRAPPER(exec, globalObject, TouchEvent, event); #endif diff --git a/WebCore/bindings/js/ScriptController.cpp b/WebCore/bindings/js/ScriptController.cpp index 89f2345..8d34f88 100644 --- a/WebCore/bindings/js/ScriptController.cpp +++ b/WebCore/bindings/js/ScriptController.cpp @@ -247,7 +247,7 @@ bool ScriptController::processingUserGestureEvent() const // keyboard events || type == eventNames().keydownEvent || type == eventNames().keypressEvent || type == eventNames().keyupEvent -#if ENABLE(TOUCH_EVENTS) // Android +#if ENABLE(TOUCH_EVENTS) // touch events || type == eventNames().touchstartEvent || type == eventNames().touchmoveEvent || type == eventNames().touchendEvent || type == eventNames().touchcancelEvent |