summaryrefslogtreecommitdiffstats
path: root/WebCore/page/DOMWindow.idl
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-01-07 16:20:05 +0000
committerBen Murdoch <benm@google.com>2010-01-20 10:33:01 +0000
commitf5306da72ab6bb63f7ae07371e687f72a75c2fb2 (patch)
tree34c3ada7bea43cd10fd036aad91a9bf2e7dbdc2d /WebCore/page/DOMWindow.idl
parentefd3d8ad1e5b1af7b31f8a9569df0b8568cdb52b (diff)
downloadexternal_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/page/DOMWindow.idl')
-rw-r--r--WebCore/page/DOMWindow.idl19
1 files changed, 10 insertions, 9 deletions
diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index c4b08c6..cfc9401 100644
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -206,12 +206,6 @@ module window {
raises(DOMException);
// Events
-#if ENABLE_TOUCH_EVENTS
- attribute EventListener ontouchstart;
- attribute EventListener ontouchend;
- attribute EventListener ontouchmove;
- attribute EventListener ontouchcancel;
-#endif
attribute EventListener onabort;
attribute EventListener onbeforeunload;
@@ -296,6 +290,12 @@ module window {
#if defined(ENABLE_ORIENTATION_EVENTS) && ENABLE_ORIENTATION_EVENTS
attribute EventListener onorientationchange;
#endif
+#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
+ attribute [DontEnum] EventListener ontouchstart;
+ attribute [DontEnum] EventListener ontouchmove;
+ attribute [DontEnum] EventListener ontouchend;
+ attribute [DontEnum] EventListener ontouchcancel;
+#endif
// EventTarget interface
[Custom] void addEventListener(in DOMString type,
@@ -466,9 +466,6 @@ module window {
attribute WheelEventConstructor WheelEvent;
attribute MessageEventConstructor MessageEvent;
attribute EventExceptionConstructor EventException;
-#if ENABLE_TOUCH_EVENTS
- attribute TouchEventConstructor TouchEvent;
-#endif
attribute WebKitCSSKeyframeRuleConstructor WebKitCSSKeyframeRule;
attribute WebKitCSSKeyframesRuleConstructor WebKitCSSKeyframesRule;
@@ -576,6 +573,10 @@ module window {
#endif
#endif
+#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
+ attribute TouchEventConstructor TouchEvent;
+#endif
+
#endif // defined(LANGUAGE_JAVASCRIPT)
#if defined(V8_BINDING) && V8_BINDING