diff options
| author | Steve Block <steveblock@google.com> | 2009-10-09 16:32:56 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:45:08 +0100 |
| commit | 74e159b4f10c313c2347259bd2af0a9f81eb40c6 (patch) | |
| tree | 3ac8790e3abe7ca06f9a56094bee70bf11e27aaf /WebCore/page/DOMWindow.h | |
| parent | 3fc3c9665962d7fc405432fd04e5851516dd4cbe (diff) | |
| download | external_webkit-74e159b4f10c313c2347259bd2af0a9f81eb40c6.zip external_webkit-74e159b4f10c313c2347259bd2af0a9f81eb40c6.tar.gz external_webkit-74e159b4f10c313c2347259bd2af0a9f81eb40c6.tar.bz2 | |
Merge webkit.org at R49305 : Use new macros to define Android touch event listeners for Node and DOMWindow.
See http://trac.webkit.org/changeset/48701
Change-Id: I160099dd16b222e016c3414f2ce06adf5cf52573
Diffstat (limited to 'WebCore/page/DOMWindow.h')
| -rw-r--r-- | WebCore/page/DOMWindow.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h index b9b700b..c116f5b 100644 --- a/WebCore/page/DOMWindow.h +++ b/WebCore/page/DOMWindow.h @@ -321,14 +321,10 @@ namespace WebCore { DEFINE_MAPPED_ATTRIBUTE_EVENT_LISTENER(webkittransitionend, webkitTransitionEnd); #if ENABLE(TOUCH_EVENTS) // Android - EventListener* ontouchstart() const; - void setOntouchstart(PassRefPtr<EventListener>); - EventListener* ontouchend() const; - void setOntouchend(PassRefPtr<EventListener>); - EventListener* ontouchmove() const; - void setOntouchmove(PassRefPtr<EventListener>); - EventListener* ontouchcancel() const; - void setOntouchcancel(PassRefPtr<EventListener>); + DEFINE_ATTRIBUTE_EVENT_LISTENER(touchstart); + DEFINE_ATTRIBUTE_EVENT_LISTENER(touchend); + DEFINE_ATTRIBUTE_EVENT_LISTENER(touchmove); + DEFINE_ATTRIBUTE_EVENT_LISTENER(touchcancel); #endif void captureEvents(); |