| Index: Source/core/html/HTMLMediaElement.idl
|
| diff --git a/Source/core/html/HTMLMediaElement.idl b/Source/core/html/HTMLMediaElement.idl
|
| index 3eb7acf107eba21d0517d59adf7b37ff0526919d..dae45e1824e7a0bfd4deea08690163fa7f43d583 100644
|
| --- a/Source/core/html/HTMLMediaElement.idl
|
| +++ b/Source/core/html/HTMLMediaElement.idl
|
| @@ -28,78 +28,78 @@
|
| ActiveDOMObject
|
| ] interface HTMLMediaElement : HTMLElement {
|
|
|
| -// error state
|
| -readonly attribute MediaError error;
|
| + // error state
|
| + readonly attribute MediaError error;
|
|
|
| -// network state
|
| -[Reflect, TreatNullAs=NullString, URL] attribute DOMString src;
|
| -[URL] readonly attribute DOMString currentSrc;
|
| + // network state
|
| + [Reflect, TreatNullAs=NullString, URL] attribute DOMString src;
|
| + [URL] readonly attribute DOMString currentSrc;
|
|
|
| -const unsigned short NETWORK_EMPTY = 0;
|
| -const unsigned short NETWORK_IDLE = 1;
|
| -const unsigned short NETWORK_LOADING = 2;
|
| -const unsigned short NETWORK_NO_SOURCE = 3;
|
| -readonly attribute unsigned short networkState;
|
| -attribute DOMString preload;
|
| + const unsigned short NETWORK_EMPTY = 0;
|
| + const unsigned short NETWORK_IDLE = 1;
|
| + const unsigned short NETWORK_LOADING = 2;
|
| + const unsigned short NETWORK_NO_SOURCE = 3;
|
| + readonly attribute unsigned short networkState;
|
| + attribute DOMString preload;
|
|
|
| -readonly attribute TimeRanges buffered;
|
| -void load();
|
| -DOMString canPlayType([Default=Undefined] optional DOMString type, [Default=Undefined, TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMString keySystem);
|
| + readonly attribute TimeRanges buffered;
|
| + void load();
|
| + DOMString canPlayType([Default=Undefined] optional DOMString type, [Default=Undefined, TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMString keySystem);
|
|
|
| -// ready state
|
| -const unsigned short HAVE_NOTHING = 0;
|
| -const unsigned short HAVE_METADATA = 1;
|
| -const unsigned short HAVE_CURRENT_DATA = 2;
|
| -const unsigned short HAVE_FUTURE_DATA = 3;
|
| -const unsigned short HAVE_ENOUGH_DATA = 4;
|
| -readonly attribute unsigned short readyState;
|
| -readonly attribute boolean seeking;
|
| + // ready state
|
| + const unsigned short HAVE_NOTHING = 0;
|
| + const unsigned short HAVE_METADATA = 1;
|
| + const unsigned short HAVE_CURRENT_DATA = 2;
|
| + const unsigned short HAVE_FUTURE_DATA = 3;
|
| + const unsigned short HAVE_ENOUGH_DATA = 4;
|
| + readonly attribute unsigned short readyState;
|
| + readonly attribute boolean seeking;
|
|
|
| -// playback state
|
| -[SetterRaisesException] attribute double currentTime;
|
| -readonly attribute double initialTime;
|
| -readonly attribute double startTime;
|
| -readonly attribute double duration;
|
| -readonly attribute boolean paused;
|
| -attribute double defaultPlaybackRate;
|
| -attribute double playbackRate;
|
| -readonly attribute TimeRanges played;
|
| -readonly attribute TimeRanges seekable;
|
| -readonly attribute boolean ended;
|
| -[Reflect] attribute boolean autoplay;
|
| -[Reflect] attribute boolean loop;
|
| -void play();
|
| -void pause();
|
| + // playback state
|
| + [SetterRaisesException] attribute double currentTime;
|
| + readonly attribute double initialTime;
|
| + readonly attribute double startTime;
|
| + readonly attribute double duration;
|
| + readonly attribute boolean paused;
|
| + attribute double defaultPlaybackRate;
|
| + attribute double playbackRate;
|
| + readonly attribute TimeRanges played;
|
| + readonly attribute TimeRanges seekable;
|
| + readonly attribute boolean ended;
|
| + [Reflect] attribute boolean autoplay;
|
| + [Reflect] attribute boolean loop;
|
| + void play();
|
| + void pause();
|
|
|
| -// media controller
|
| -[Reflect, TreatNullAs=NullString] attribute DOMString mediaGroup;
|
| -[CustomSetter] attribute MediaController controller;
|
| + // media controller
|
| + [Reflect, TreatNullAs=NullString] attribute DOMString mediaGroup;
|
| + [CustomSetter] attribute MediaController controller;
|
|
|
| -// controls
|
| -attribute boolean controls;
|
| -[SetterRaisesException] attribute double volume;
|
| -attribute boolean muted;
|
| -[Reflect=muted] attribute boolean defaultMuted;
|
| + // controls
|
| + attribute boolean controls;
|
| + [SetterRaisesException] attribute double volume;
|
| + attribute boolean muted;
|
| + [Reflect=muted] attribute boolean defaultMuted;
|
|
|
| -// tracks
|
| -[RuntimeEnabled=VideoTrack] readonly attribute TextTrackList textTracks;
|
| -[RuntimeEnabled=VideoTrack, RaisesException] TextTrack addTextTrack(DOMString kind, optional DOMString label, optional DOMString language);
|
| + // tracks
|
| + [RuntimeEnabled=VideoTrack] readonly attribute TextTrackList textTracks;
|
| + [RuntimeEnabled=VideoTrack, RaisesException] TextTrack addTextTrack(DOMString kind, optional DOMString label, optional DOMString language);
|
|
|
| -// WebKit extensions
|
| + // WebKit extensions
|
|
|
| -// The number of bytes consumed by the media decoder.
|
| -readonly attribute unsigned long webkitAudioDecodedByteCount;
|
| -readonly attribute unsigned long webkitVideoDecodedByteCount;
|
| + // The number of bytes consumed by the media decoder.
|
| + [MeasureAs=PrefixedAudioDecodedByteCount] readonly attribute unsigned long webkitAudioDecodedByteCount;
|
| + [MeasureAs=PrefixedVideoDecodedByteCount] readonly attribute unsigned long webkitVideoDecodedByteCount;
|
|
|
| -// FIXME: add DeprecateAs=PrefixedMediaGenerateKeyRequest when MediaKeys is ready.
|
| -[RuntimeEnabled=PrefixedEncryptedMedia, RaisesException] void webkitGenerateKeyRequest([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, optional Uint8Array initData);
|
| -[RuntimeEnabled=PrefixedEncryptedMedia, RaisesException] void webkitAddKey([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, Uint8Array key, optional Uint8Array initData, [Default=NullString] optional DOMString sessionId);
|
| -[RuntimeEnabled=PrefixedEncryptedMedia, RaisesException] void webkitCancelKeyRequest([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, [Default=NullString] optional DOMString sessionId);
|
| + // FIXME: add DeprecateAs=PrefixedMediaGenerateKeyRequest when MediaKeys is ready.
|
| + [RuntimeEnabled=PrefixedEncryptedMedia, RaisesException] void webkitGenerateKeyRequest([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, optional Uint8Array initData);
|
| + [RuntimeEnabled=PrefixedEncryptedMedia, RaisesException] void webkitAddKey([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, Uint8Array key, optional Uint8Array initData, [Default=NullString] optional DOMString sessionId);
|
| + [RuntimeEnabled=PrefixedEncryptedMedia, RaisesException] void webkitCancelKeyRequest([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, [Default=NullString] optional DOMString sessionId);
|
|
|
| -[RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeyadded;
|
| -[RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeyerror;
|
| -[RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeymessage;
|
| -[RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitneedkey;
|
| + [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeyadded;
|
| + [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeyerror;
|
| + [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeymessage;
|
| + [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitneedkey;
|
|
|
| -[RuntimeEnabled=EncryptedMedia, Conditional=ENCRYPTED_MEDIA_V2] attribute MediaKeys mediaKeys;
|
| + [RuntimeEnabled=EncryptedMedia, Conditional=ENCRYPTED_MEDIA_V2] attribute MediaKeys mediaKeys;
|
| };
|
|
|