From 5a616bf5655ac37a20698d628919ab967ea4b18e Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 27 Jan 2010 14:43:07 +0000 Subject: Update Android to reflect final version submitted to webkit.org for touch events. See https://android-git.corp.google.com/g/#change,37040 http://trac.webkit.org/changeset/51981 and http://trac.webkit.org/changeset/53548 Change-Id: Ide43a0425cff940bfd07022d8e9bb72e3d12ce96 --- WebCore/dom/Element.h | 1 + WebCore/page/DOMWindow.idl | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'WebCore') diff --git a/WebCore/dom/Element.h b/WebCore/dom/Element.h index ce25d70..bc9a7d7 100644 --- a/WebCore/dom/Element.h +++ b/WebCore/dom/Element.h @@ -94,6 +94,7 @@ public: DEFINE_ATTRIBUTE_EVENT_LISTENER(touchend); DEFINE_ATTRIBUTE_EVENT_LISTENER(touchcancel); #endif + const AtomicString& getIDAttribute() const; bool hasAttribute(const QualifiedName&) const; const AtomicString& getAttribute(const QualifiedName&) const; diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl index cfc9401..71d7ca4 100644 --- a/WebCore/page/DOMWindow.idl +++ b/WebCore/page/DOMWindow.idl @@ -290,12 +290,12 @@ module window { #if defined(ENABLE_ORIENTATION_EVENTS) && ENABLE_ORIENTATION_EVENTS attribute EventListener onorientationchange; #endif -#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS + #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 + #endif // EventTarget interface [Custom] void addEventListener(in DOMString type, -- cgit v1.1