Unreviewed, rolling out r200700, r200703, and r200713.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 May 2016 00:31:49 +0000 (00:31 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 12 May 2016 00:31:49 +0000 (00:31 +0000)
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-queue@webkit.org> on 2016-05-11

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@200717 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/bindings/js/JSDOMWindowCustom.cpp
Source/WebCore/bindings/js/ios/TouchConstructors.cpp
Source/WebCore/page/DOMWindow.idl

index 5d1acde..674aa29 100644 (file)
@@ -1,3 +1,22 @@
+2016-05-11  Commit Queue  <commit-queue@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  <rniwa@webkit.org>
 
         iOS clean build fix after r200700.
index 861be51..f7ea017 100644 (file)
 #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 @@ JSValue JSDOMWindow::image(ExecState& state) const
     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)
index 99b1d5a..ebc016b 100644 (file)
@@ -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
index e7781a3..8335b44 100644 (file)
     [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)