Changeset 207501 in webkit

Timestamp:

Oct 18, 2016 4:40:53 PM (8 years ago)

Author:

Chris Dumez

Message:

[iOS] Drop JSDictionary::convertValue() overload taking a TouchList
​https://bugs.webkit.org/show_bug.cgi?id=163620

Reviewed by Sam Weinig.

Drop JSDictionary::convertValue() overload taking a TouchList now that
TouchEvent is using a proper constructor with a TouchEventInit
dictionary on iOS.

• bindings/js/JSDictionary.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSDictionary.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-18  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Drop JSDictionary::convertValue() overload taking a TouchList
+        https://bugs.webkit.org/show_bug.cgi?id=163620
+
+        Reviewed by Sam Weinig.
+
+        Drop JSDictionary::convertValue() overload taking a TouchList now that
+        TouchEvent is using a proper constructor with a TouchEventInit
+        dictionary on iOS.
+
+        * bindings/js/JSDictionary.cpp:
+
 2016-10-18  Dean Jackson  <dino@apple.com>
 

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

@@ -353 +353 @@
 #endif
 
-#if ENABLE(TOUCH_EVENTS) && !ENABLE(IOS_TOUCH_EVENTS)
+#if ENABLE(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