auto import from //branches/cupcake_rel/...@138607

diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk
index c50b1ca..faac348 100644 (file)
--- a/WebCore/Android.derived.mk
+++ b/WebCore/Android.derived.mk
@@ -150,7 +150,7 @@ js_binding_scripts := $(addprefix $(LOCAL_PATH)/,\
                        bindings/scripts/generate-bindings.pl \
                )
 
-FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT
+FEATURE_DEFINES := ANDROID_ORIENTATION_SUPPORT ENABLE_TOUCH_EVENTS=1
 
 GEN := \
     $(intermediates)/css/JSCSSCharsetRule.h \

diff --git a/WebCore/dom/EventTargetNode.idl b/WebCore/dom/EventTargetNode.idl
index 0049593..acb2e95 100644 (file)
--- a/WebCore/dom/EventTargetNode.idl
+++ b/WebCore/dom/EventTargetNode.idl
@@ -70,6 +70,12 @@ module core {
         attribute [DontEnum, ProtectedListener] EventListener onselectstart;
         attribute [DontEnum, ProtectedListener] EventListener onsubmit;
         attribute [DontEnum, ProtectedListener] EventListener onunload;
+#if ENABLE_TOUCH_EVENTS
+        attribute [DontEnum, ProtectedListener] EventListener ontouchstart;
+        attribute [DontEnum, ProtectedListener] EventListener ontouchend;
+        attribute [DontEnum, ProtectedListener] EventListener ontouchmove;
+        attribute [DontEnum, ProtectedListener] EventListener ontouchcancel;
+#endif
 
         [Custom] void addEventListener(in DOMString type, 
                                        in EventListener listener,