Title: [200717] trunk/Source/WebCore
- Revision
- 200717
- Author
- rn...@webkit.org
- Date
- 2016-05-11 17:31:49 -0700 (Wed, 11 May 2016)
Log Message
Unreviewed, rolling out r200700, r200703, and r200713.
https://bugs.webkit.org/show_bug.cgi?id=157601
Broke iOS builds (Requested by rniwa on #webkit).
Reverted changesets:
"Touch.prototype is undefined on iOS"
https://bugs.webkit.org/show_bug.cgi?id=157560
http://trac.webkit.org/changeset/200700
"iOS build fix attempt after r200700."
http://trac.webkit.org/changeset/200703
"iOS clean build fix after r200700."
http://trac.webkit.org/changeset/200713
Patch by Commit Queue <commit-qu...@webkit.org> on 2016-05-11
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (200716 => 200717)
--- trunk/Source/WebCore/ChangeLog 2016-05-12 00:01:36 UTC (rev 200716)
+++ trunk/Source/WebCore/ChangeLog 2016-05-12 00:31:49 UTC (rev 200717)
@@ -1,3 +1,22 @@
+2016-05-11 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r200700, r200703, and r200713.
+ https://bugs.webkit.org/show_bug.cgi?id=157601
+
+ Broke iOS builds (Requested by rniwa on #webkit).
+
+ Reverted changesets:
+
+ "Touch.prototype is undefined on iOS"
+ https://bugs.webkit.org/show_bug.cgi?id=157560
+ http://trac.webkit.org/changeset/200700
+
+ "iOS build fix attempt after r200700."
+ http://trac.webkit.org/changeset/200703
+
+ "iOS clean build fix after r200700."
+ http://trac.webkit.org/changeset/200713
+
2016-05-11 Ryosuke Niwa <rn...@webkit.org>
iOS clean build fix after r200700.
Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (200716 => 200717)
--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-05-12 00:01:36 UTC (rev 200716)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2016-05-12 00:31:49 UTC (rev 200717)
@@ -39,6 +39,11 @@
#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
@@ -433,6 +438,18 @@
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 (200716 => 200717)
--- trunk/Source/WebCore/bindings/js/ios/TouchConstructors.cpp 2016-05-12 00:01:36 UTC (rev 200716)
+++ trunk/Source/WebCore/bindings/js/ios/TouchConstructors.cpp 2016-05-12 00:31:49 UTC (rev 200717)
@@ -27,7 +27,7 @@
#if ENABLE(IOS_TOUCH_EVENTS)
-#include <WebKitAdditions/JSTouchCustomIOS.cpp>
-#include <WebKitAdditions/JSTouchListCustomIOS.cpp>
+#include <WebKitAdditions/JSTouchConstructorIOS.cpp>
+#include <WebKitAdditions/JSTouchListConstructorIOS.cpp>
#endif
Modified: trunk/Source/WebCore/page/DOMWindow.idl (200716 => 200717)
--- trunk/Source/WebCore/page/DOMWindow.idl 2016-05-12 00:01:36 UTC (rev 200716)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2016-05-12 00:31:49 UTC (rev 200717)
@@ -190,6 +190,9 @@
[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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
