Title: [207501] trunk/Source/WebCore
- Revision
- 207501
- Author
- cdu...@apple.com
- Date
- 2016-10-18 16:40:53 -0700 (Tue, 18 Oct 2016)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (207500 => 207501)
--- trunk/Source/WebCore/ChangeLog 2016-10-18 23:40:10 UTC (rev 207500)
+++ trunk/Source/WebCore/ChangeLog 2016-10-18 23:40:53 UTC (rev 207501)
@@ -1,3 +1,16 @@
+2016-10-18 Chris Dumez <cdu...@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 <d...@apple.com>
Remove CSS_SHAPES feature definition. This should always be on.
Modified: trunk/Source/WebCore/bindings/js/JSDictionary.cpp (207500 => 207501)
--- trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2016-10-18 23:40:10 UTC (rev 207500)
+++ trunk/Source/WebCore/bindings/js/JSDictionary.cpp 2016-10-18 23:40:53 UTC (rev 207501)
@@ -352,7 +352,7 @@
}
#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);
@@ -359,31 +359,6 @@
}
#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
-
void JSDictionary::convertValue(JSC::ExecState*, JSC::JSValue value, JSC::JSFunction*& result)
{
result = jsDynamicCast<JSC::JSFunction*>(value);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
