Title: [200788] trunk/Source/WebCore
Revision
200788
Author
[email protected]
Date
2016-05-12 12:54:51 -0700 (Thu, 12 May 2016)

Log Message

Touch.prototype is undefined on iOS
https://bugs.webkit.org/show_bug.cgi?id=157560
<rdar://problem/26143008>

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.
* bindings/js/ios/TouchConstructors.cpp:
* page/DOMWindow.idl:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (200787 => 200788)


--- trunk/Source/WebCore/ChangeLog	2016-05-12 19:51:14 UTC (rev 200787)
+++ trunk/Source/WebCore/ChangeLog	2016-05-12 19:54:51 UTC (rev 200788)
@@ -1,5 +1,22 @@
 2016-05-12  Ryosuke Niwa  <[email protected]>
 
+        Touch.prototype is undefined on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=157560
+        <rdar://problem/26143008>
+
+        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.
+        * bindings/js/ios/TouchConstructors.cpp:
+        * page/DOMWindow.idl:
+
+2016-05-12  Ryosuke Niwa  <[email protected]>
+
         indexForVisiblePosition should use the root editable element as the scope
         https://bugs.webkit.org/show_bug.cgi?id=157611
 

Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (200787 => 200788)


--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp	2016-05-12 19:51:14 UTC (rev 200787)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp	2016-05-12 19:54:51 UTC (rev 200788)
@@ -39,11 +39,6 @@
 #include "ScheduledAction.h"
 #include "Settings.h"
 
-#if ENABLE(IOS_TOUCH_EVENTS)
-#include "JSTouchConstructorIOS.h"
-#include "JSTouchListConstructorIOS.h"
-#endif
-
 #if ENABLE(WEB_AUDIO)
 #include "JSAudioContext.h"
 #endif
@@ -438,18 +433,6 @@
     return createImageConstructor(state.vm(), *this);
 }
 
-#if ENABLE(IOS_TOUCH_EVENTS)
-JSValue JSDOMWindow::touch(ExecState& state) const
-{
-    return getDOMConstructor<JSTouchConstructor>(state.vm(), *this);
-}
-
-JSValue JSDOMWindow::touchList(ExecState& state) const
-{
-    return getDOMConstructor<JSTouchListConstructor>(state.vm(), *this);
-}
-#endif
-
 // Custom functions
 
 JSValue JSDOMWindow::open(ExecState& state)

Modified: trunk/Source/WebCore/bindings/js/ios/TouchConstructors.cpp (200787 => 200788)


--- trunk/Source/WebCore/bindings/js/ios/TouchConstructors.cpp	2016-05-12 19:51:14 UTC (rev 200787)
+++ trunk/Source/WebCore/bindings/js/ios/TouchConstructors.cpp	2016-05-12 19:54:51 UTC (rev 200788)
@@ -27,7 +27,7 @@
 
 #if ENABLE(IOS_TOUCH_EVENTS)
 
-#include <WebKitAdditions/JSTouchConstructorIOS.cpp>
-#include <WebKitAdditions/JSTouchListConstructorIOS.cpp>
+#include <WebKitAdditions/JSTouchCustomIOS.cpp>
+#include <WebKitAdditions/JSTouchListCustomIOS.cpp>
 
 #endif

Modified: trunk/Source/WebCore/page/DOMWindow.idl (200787 => 200788)


--- trunk/Source/WebCore/page/DOMWindow.idl	2016-05-12 19:51:14 UTC (rev 200787)
+++ trunk/Source/WebCore/page/DOMWindow.idl	2016-05-12 19:54:51 UTC (rev 200788)
@@ -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)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to