Source/core/html/HTMLMediaElement.idl - Issue 157423003: Remove the dependency on encryptedmedia from HTMLMediaElement.

Side by Side Diff: Source/core/html/HTMLMediaElement.idl

Issue 157423003: Remove the dependency on encryptedmedia from HTMLMediaElement. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fix compilation error on linux Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2007, 2010, 2011, 2012 Apple Inc. All rights reserved.	2 * Copyright (C) 2007, 2010, 2011, 2012 Apple Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

8 * notice, this list of conditions and the following disclaimer.	8 * notice, this list of conditions and the following disclaimer.

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
82	82

83 // tracks	83 // tracks

84 [RuntimeEnabled=VideoTrack] readonly attribute TextTrackList textTracks;	84 [RuntimeEnabled=VideoTrack] readonly attribute TextTrackList textTracks;

85 [RuntimeEnabled=VideoTrack, RaisesException] TextTrack addTextTrack(DOMStrin g kind, optional DOMString label, optional DOMString language);	85 [RuntimeEnabled=VideoTrack, RaisesException] TextTrack addTextTrack(DOMStrin g kind, optional DOMString label, optional DOMString language);

86	86

87 // WebKit extensions	87 // WebKit extensions

88	88

89 // The number of bytes consumed by the media decoder.	89 // The number of bytes consumed by the media decoder.

90 [MeasureAs=PrefixedAudioDecodedByteCount] readonly attribute unsigned long w ebkitAudioDecodedByteCount;	90 [MeasureAs=PrefixedAudioDecodedByteCount] readonly attribute unsigned long w ebkitAudioDecodedByteCount;

91 [MeasureAs=PrefixedVideoDecodedByteCount] readonly attribute unsigned long w ebkitVideoDecodedByteCount;	91 [MeasureAs=PrefixedVideoDecodedByteCount] readonly attribute unsigned long w ebkitVideoDecodedByteCount;

92

93 [RuntimeEnabled=PrefixedEncryptedMedia, RaisesException, MeasureAs=PrefixedM ediaGenerateKeyRequest] void webkitGenerateKeyRequest([TreatNullAs=NullString, T reatUndefinedAs=NullString] DOMString keySystem, optional Uint8Array initData);

94 [RuntimeEnabled=PrefixedEncryptedMedia, RaisesException, MeasureAs=PrefixedM ediaAddKey] void webkitAddKey([TreatNullAs=NullString, TreatUndefinedAs=NullStri ng] DOMString keySystem, Uint8Array key, optional Uint8Array initData, [Default= NullString] optional DOMString sessionId);

95 [RuntimeEnabled=PrefixedEncryptedMedia, RaisesException, MeasureAs=PrefixedM ediaCancelKeyRequest] void webkitCancelKeyRequest([TreatNullAs=NullString, Treat UndefinedAs=NullString] DOMString keySystem, [Default=NullString] optional DOMSt ring sessionId);

96

97 [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeyad ded;

98 [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeyer ror;

99 [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeyme ssage;

100 [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitneedk ey;

101

102 [RuntimeEnabled=EncryptedMedia] readonly attribute MediaKeys mediaKeys;

103 [RuntimeEnabled=EncryptedMedia, RaisesException] void setMediaKeys(MediaKeys mediaKeys);

104 [RuntimeEnabled=EncryptedMedia] attribute EventHandler onneedkey;

105 };	92 };

OLD	NEW

« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h » ('j') | no next file with comments »