diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-13 13:04:22 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-13 13:04:22 -0700 |
| commit | 3b1318beb3f32d5008cc74857d70e1abfac309ad (patch) | |
| tree | c0aabe334f217d2a5bbbb7bb04cffda0f2bcfe2f | |
| parent | e67bd8de533debe80a307056f0f62065d6fd5041 (diff) | |
| download | external_webkit-3b1318beb3f32d5008cc74857d70e1abfac309ad.zip external_webkit-3b1318beb3f32d5008cc74857d70e1abfac309ad.tar.gz external_webkit-3b1318beb3f32d5008cc74857d70e1abfac309ad.tar.bz2 | |
auto import from //branches/cupcake_rel/...@138607
| -rw-r--r-- | WebCore/Android.derived.mk | 2 | ||||
| -rw-r--r-- | WebCore/dom/EventTargetNode.idl | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk index c50b1ca..faac348 100644 --- 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 --- 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, |