Title: [201008] branches/safari-602.1.32-branch/Source/WebCore
- Revision
- 201008
- Author
- [email protected]
- Date
- 2016-05-17 01:47:11 -0700 (Tue, 17 May 2016)
Log Message
Merge r200788. rdar://problem/26143008
Modified Paths
Diff
Modified: branches/safari-602.1.32-branch/Source/WebCore/ChangeLog (201007 => 201008)
--- branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 08:47:09 UTC (rev 201007)
+++ branches/safari-602.1.32-branch/Source/WebCore/ChangeLog 2016-05-17 08:47:11 UTC (rev 201008)
@@ -1,5 +1,26 @@
2016-05-17 Babak Shafiei <[email protected]>
+ Merge r200788. rdar://problem/26143008
+
+ 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-17 Babak Shafiei <[email protected]>
+
Merge r200688. rdar://problem/26013966
2016-05-11 Jer Noble <[email protected]>
Modified: branches/safari-602.1.32-branch/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (201007 => 201008)
--- branches/safari-602.1.32-branch/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-05-17 08:47:09 UTC (rev 201007)
+++ branches/safari-602.1.32-branch/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-05-17 08:47:11 UTC (rev 201008)
@@ -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: branches/safari-602.1.32-branch/Source/WebCore/bindings/js/ios/TouchConstructors.cpp (201007 => 201008)
--- branches/safari-602.1.32-branch/Source/WebCore/bindings/js/ios/TouchConstructors.cpp 2016-05-17 08:47:09 UTC (rev 201007)
+++ branches/safari-602.1.32-branch/Source/WebCore/bindings/js/ios/TouchConstructors.cpp 2016-05-17 08:47:11 UTC (rev 201008)
@@ -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: branches/safari-602.1.32-branch/Source/WebCore/page/DOMWindow.idl (201007 => 201008)
--- branches/safari-602.1.32-branch/Source/WebCore/page/DOMWindow.idl 2016-05-17 08:47:09 UTC (rev 201007)
+++ branches/safari-602.1.32-branch/Source/WebCore/page/DOMWindow.idl 2016-05-17 08:47:11 UTC (rev 201008)
@@ -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
