From 74e159b4f10c313c2347259bd2af0a9f81eb40c6 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 9 Oct 2009 16:32:56 +0100 Subject: 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 --- WebCore/page/DOMWindow.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'WebCore/page/DOMWindow.h') 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* ontouchend() const; - void setOntouchend(PassRefPtr); - EventListener* ontouchmove() const; - void setOntouchmove(PassRefPtr); - EventListener* ontouchcancel() const; - void setOntouchcancel(PassRefPtr); + DEFINE_ATTRIBUTE_EVENT_LISTENER(touchstart); + DEFINE_ATTRIBUTE_EVENT_LISTENER(touchend); + DEFINE_ATTRIBUTE_EVENT_LISTENER(touchmove); + DEFINE_ATTRIBUTE_EVENT_LISTENER(touchcancel); #endif void captureEvents(); -- cgit v1.1