Title: [201220] tags/Safari-602.1.33.1/Source/WebCore
- Revision
- 201220
- Author
- [email protected]
- Date
- 2016-05-20 12:07:52 -0700 (Fri, 20 May 2016)
Log Message
Merged r201212. rdar://problem/26385907
Modified Paths
Diff
Modified: tags/Safari-602.1.33.1/Source/WebCore/ChangeLog (201219 => 201220)
--- tags/Safari-602.1.33.1/Source/WebCore/ChangeLog 2016-05-20 19:06:48 UTC (rev 201219)
+++ tags/Safari-602.1.33.1/Source/WebCore/ChangeLog 2016-05-20 19:07:52 UTC (rev 201220)
@@ -1,3 +1,19 @@
+2016-05-20 Babak Shafiei <[email protected]>
+
+ Merge r201212.
+
+ 2016-05-19 Tim Horton <[email protected]>
+
+ REGRESSION (r200638): -[DOMHTMLVideoElement play] disappeared from ObjC bindings
+ https://bugs.webkit.org/show_bug.cgi?id=157940
+ <rdar://problem/26385907>
+
+ Reviewed by Dan Bernstein.
+
+ * html/HTMLMediaElement.idl:
+ Drop the return value of play from the ObjC bindings, because the bindings
+ generator doesn't seem to know what to do with a Promise.
+
2016-05-18 Brady Eidson <[email protected]>
Modern IDB: Make TestRunner.clearAllDatabases also delete IndexedDB databases (once doing so is supported).
Modified: tags/Safari-602.1.33.1/Source/WebCore/html/HTMLMediaElement.idl (201219 => 201220)
--- tags/Safari-602.1.33.1/Source/WebCore/html/HTMLMediaElement.idl 2016-05-20 19:06:48 UTC (rev 201219)
+++ tags/Safari-602.1.33.1/Source/WebCore/html/HTMLMediaElement.idl 2016-05-20 19:07:52 UTC (rev 201220)
@@ -75,7 +75,11 @@
readonly attribute boolean ended;
[Reflect] attribute boolean autoplay;
[Reflect] attribute boolean loop;
+#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
Promise play();
+#else
+ void play();
+#endif
void pause();
void fastSeek(unrestricted double time);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
