From 468feeee19c911022e51c90a58bdd89a18e31309 Mon Sep 17 00:00:00 2001 From: "rniwa@webkit.org" Date: Wed, 11 May 2016 20:09:37 +0000 Subject: [PATCH] Touch.prototype is undefined on iOS https://bugs.webkit.org/show_bug.cgi?id=157560 Reviewed by Chris Dumez. Remove Touch and TouchList attributes from DOMWindow. These attributes should be exposed via generated binding code (JSDOMWindow.cpp). * bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::touch): Deleted. (WebCore::JSDOMWindow::touchList): Deleted. * page/DOMWindow.idl: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@200700 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebCore/ChangeLog | 16 ++++++++++++++++ Source/WebCore/bindings/js/JSDOMWindowCustom.cpp | 12 ------------ Source/WebCore/page/DOMWindow.idl | 3 --- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index dba379a..0bd3aea 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,19 @@ +2016-05-10 Ryosuke Niwa + + Touch.prototype is undefined on iOS + https://bugs.webkit.org/show_bug.cgi?id=157560 + + + Reviewed by Chris Dumez. + + Remove Touch and TouchList attributes from DOMWindow. + These attributes should be exposed via generated binding code (JSDOMWindow.cpp). + + * bindings/js/JSDOMWindowCustom.cpp: + (WebCore::JSDOMWindow::touch): Deleted. + (WebCore::JSDOMWindow::touchList): Deleted. + * page/DOMWindow.idl: + 2016-05-11 Darin Adler Change IDBObjectStore.createIndex to take an IDL dictionary diff --git a/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp b/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp index f7ea017..dc62983 100644 --- a/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp +++ b/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp @@ -438,18 +438,6 @@ JSValue JSDOMWindow::image(ExecState& state) const return createImageConstructor(state.vm(), *this); } -#if ENABLE(IOS_TOUCH_EVENTS) -JSValue JSDOMWindow::touch(ExecState& state) const -{ - return getDOMConstructor(state.vm(), *this); -} - -JSValue JSDOMWindow::touchList(ExecState& state) const -{ - return getDOMConstructor(state.vm(), *this); -} -#endif - // Custom functions JSValue JSDOMWindow::open(ExecState& state) diff --git a/Source/WebCore/page/DOMWindow.idl b/Source/WebCore/page/DOMWindow.idl index 8335b44..e7781a3 100644 --- a/Source/WebCore/page/DOMWindow.idl +++ b/Source/WebCore/page/DOMWindow.idl @@ -190,9 +190,6 @@ [CustomGetter, CustomConstructor] attribute HTMLImageElementNamedConstructor Image; // Usable with new operator attribute DOMTokenListConstructor DOMSettableTokenList; // Map DOMSettableTokenList to DOMTokenList for backward compatibility. - [Conditional=IOS_TOUCH_EVENTS, CustomGetter] attribute TouchConstructor Touch; // Usable with the new operator - [Conditional=IOS_TOUCH_EVENTS, CustomGetter] attribute TouchListConstructor TouchList; // Usable with the new operator - attribute DOMURLConstructor webkitURL; // FIXME: deprecate this. attribute MutationObserverConstructor WebKitMutationObserver; // FIXME: Add metrics to determine when we can remove this. #endif // defined(LANGUAGE_JAVASCRIPT) -- 1.8.3.1