Modified: trunk/Source/WebCore/ChangeLog (199356 => 199357)
--- trunk/Source/WebCore/ChangeLog 2016-04-12 16:10:46 UTC (rev 199356)
+++ trunk/Source/WebCore/ChangeLog 2016-04-12 16:11:01 UTC (rev 199357)
@@ -1,3 +1,15 @@
+2016-04-12 Darin Adler <[email protected]>
+
+ Remove UsePointersEvenForNonNullableObjectArguments from HTMLMediaElement
+ https://bugs.webkit.org/show_bug.cgi?id=156492
+
+ Reviewed by Chris Dumez.
+
+ * html/HTMLMediaElement.idl: Removed UsePointersEvenForNonNullableObjectArguments,
+ sorted remaining class attributes, simplified #if around canPlayType a bit,
+ removed comment that is not all that useful, made the argument to
+ webkitSetMediaKeys nullable since the implementation supports that.
+
2016-04-12 Eric Carlson <[email protected]>
[iOS] media title sometimes remain in Control Center after tab is closed
Modified: trunk/Source/WebCore/html/HTMLMediaElement.idl (199356 => 199357)
--- trunk/Source/WebCore/html/HTMLMediaElement.idl 2016-04-12 16:10:46 UTC (rev 199356)
+++ trunk/Source/WebCore/html/HTMLMediaElement.idl 2016-04-12 16:11:01 UTC (rev 199357)
@@ -24,11 +24,10 @@
*/
[
- Conditional=VIDEO,
- UsePointersEvenForNonNullableObjectArguments,
- JSGenerateToNativeObject,
ActiveDOMObject,
+ Conditional=VIDEO,
ExportMacro=WEBCORE_EXPORT,
+ JSGenerateToNativeObject,
] interface HTMLMediaElement : HTMLElement {
// error state
@@ -47,10 +46,8 @@
readonly attribute TimeRanges buffered;
void load();
-#if defined(ENABLE_ENCRYPTED_MEDIA) && ENABLE_ENCRYPTED_MEDIA
+#if (defined(ENABLE_ENCRYPTED_MEDIA) && ENABLE_ENCRYPTED_MEDIA) || (defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2)
DOMString canPlayType([Default=Undefined] optional DOMString type, optional DOMString? keySystem);
-#elif defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2
- DOMString canPlayType([Default=Undefined] optional DOMString type, optional DOMString? keySystem);
#else
DOMString canPlayType([Default=Undefined] optional DOMString type);
#endif
@@ -98,14 +95,13 @@
[Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitVideoDecodedByteCount;
#endif
- // Work around shortcomings in the gobject binding generator handling of conditional features by turning these off for gobject.
#if (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT) && (!defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C)
[Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitGenerateKeyRequest(DOMString? keySystem, optional Uint8Array initData);
[Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitAddKey(DOMString? keySystem, Uint8Array key, optional Uint8Array initData, [Default=NullString] optional DOMString sessionId);
[Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitCancelKeyRequest(DOMString? keySystem, [Default=NullString] optional DOMString sessionId);
[Conditional=ENCRYPTED_MEDIA_V2, ImplementedAs=keys] readonly attribute MediaKeys webkitKeys;
- [Conditional=ENCRYPTED_MEDIA_V2, ImplementedAs=setMediaKeys] void webkitSetMediaKeys(MediaKeys mediaKeys);
+ [Conditional=ENCRYPTED_MEDIA_V2, ImplementedAs=setMediaKeys] void webkitSetMediaKeys(MediaKeys? mediaKeys);
[Conditional=VIDEO_TRACK, RaisesException] TextTrack addTextTrack(DOMString kind, optional DOMString label, optional DOMString language);
[Conditional=VIDEO_TRACK] readonly attribute AudioTrackList audioTracks;
