Changeset 206681 in webkit

Timestamp:

Sep 30, 2016, 3:21:59 PM (9 years ago)

Author:

Chris Dumez

Message:

[iOS] Allow sequence<Touch> input in TouchEvent constructor
​https://bugs.webkit.org/show_bug.cgi?id=162806
<rdar://problem/28566429>

Reviewed by Ryosuke Niwa.

Allow sequence<Touch> input in TouchEvent constructor in addition to
TouchList objects. It is convenient for developers to pass arrays of
Touch objects.

No new tests, already covered by:
imported/w3c/web-platform-tests/touch-events/touch-touchevent-constructor.html

• bindings/js/JSDOMBinding.h:

(WebCore::toRefNativeArray):
(WebCore::toRefPtrNativeArray):

• bindings/js/JSDictionary.cpp:

(WebCore::JSDictionary::convertValue):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDOMBinding.h (modified) (3 diffs)
• bindings/js/JSDictionary.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-30  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Allow sequence<Touch> input in TouchEvent constructor
+        https://bugs.webkit.org/show_bug.cgi?id=162806
+        <rdar://problem/28566429>
+
+        Reviewed by Ryosuke Niwa.
+
+        Allow sequence<Touch> input in TouchEvent constructor in addition to
+        TouchList objects. It is convenient for developers to pass arrays of
+        Touch objects.
+
+        No new tests, already covered by:
+        imported/w3c/web-platform-tests/touch-events/touch-touchevent-constructor.html
+
+        * bindings/js/JSDOMBinding.h:
+        (WebCore::toRefNativeArray):
+        (WebCore::toRefPtrNativeArray):
+        * bindings/js/JSDictionary.cpp:
+        (WebCore::JSDictionary::convertValue):
+
 2016-09-30  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/bindings/js/JSDOMBinding.h

@@ -310 +310 @@
 RefPtr<JSC::Float64Array> toFloat64Array(JSC::JSValue);
 
-template<typename T, typename JSType> Vector<RefPtr<T>> toRefPtrNativeArray(JSC::ExecState*, JSC::JSValue);
+template<typename T, typename JSType> Vector<Ref<T>> toRefNativeArray(JSC::ExecState&, JSC::JSValue);
+template<typename T, typename JSType> Vector<RefPtr<T>> toRefPtrNativeArray(JSC::ExecState&, JSC::JSValue);
 template<typename T> Vector<T> toNativeArray(JSC::ExecState&, JSC::JSValue);
 bool hasIteratorMethod(JSC::ExecState&, JSC::JSValue);
@@ -813 +814 @@
 };
 
+template<typename T, typename JST> inline Vector<Ref<T>> toRefNativeArray(JSC::ExecState& state, JSC::JSValue value)
+{
+    JSC::VM& vm = state.vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
+    if (!value.isObject()) {
+        throwSequenceTypeError(state, scope);
+        return { };
+    }
+
+    Vector<Ref<T>> result;
+    forEachInIterable(&state, value, [&result](JSC::VM& vm, JSC::ExecState* state, JSC::JSValue jsValue) {
+        auto scope = DECLARE_THROW_SCOPE(vm);
+
+        if (jsValue.inherits(JST::info())) {
+            auto* object = JST::toWrapped(jsValue);
+            ASSERT(object);
+            result.append(*object);
+        } else
+            throwArrayElementTypeError(*state, scope);
+    });
+    return result;
+}
+
 template<typename T, typename JST> Vector<RefPtr<T>> toRefPtrNativeArray(JSC::ExecState& exec, JSC::JSValue value)
 {
@@ -820 +845 @@
     if (!value.isObject()) {
         throwSequenceTypeError(exec, scope);
-        return Vector<RefPtr<T>>();
+        return { };
     }
 

trunk/Source/WebCore/bindings/js/JSDictionary.cpp

@@ -70 +70 @@
 
 #if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(TOUCH_EVENTS)
+#include "JSTouch.h"
 #include "JSTouchList.h"
 #endif
@@ -352 +353 @@
 #endif
 
-#if ENABLE(IOS_TOUCH_EVENTS) || ENABLE(TOUCH_EVENTS)
+#if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS)
 void JSDictionary::convertValue(JSC::ExecState*, JSC::JSValue value, RefPtr<TouchList>& result)
 {
     result = JSTouchList::toWrapped(value);
+}
+#endif
+
+#if ENABLE(IOS_TOUCH_EVENTS)
+void JSDictionary::convertValue(JSC::ExecState* exec, JSC::JSValue value, RefPtr<TouchList>& result)
+{
+    VM& vm = exec->vm();
+    auto scope = DECLARE_THROW_SCOPE(vm);
+
+    JSObject* object = value.getObject();
+    if (!object) {
+        result = nullptr;
+        return;
+    }
+
+    // Allow both TouchList and sequence<Touch> as input.
+    const ClassInfo* classInfo = object->classInfo();
+    if (classInfo == JSTouchList::info()) {
+        result = JSTouchList::toWrapped(value);
+        return;
+    }
+
+    auto touches = toRefNativeArray<Touch, JSTouch>(*exec, value);
+    RETURN_IF_EXCEPTION(scope, void());
+    result = TouchList::create(WTFMove(touches));
 }
 #endif