Commit 4aa5b972 authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Commit Bot

media: Mark more EME APIs with SecureContext

Previously this was only partially done due to issue 634270. Now that
issue has been fixed and we can mark more EME APIs with SecureContext.

In the current EME spec, there are 9 APIs marked with SecureContext.
This CL makes sure all of them are marked with SecureContext in Blink
IDL.

Also mark getStatusForPolicy() (not in EME spec yet) with SecureContext.

Bug: 692289
Test: Manually tested and verified no MediaKey* exposed in http://
Change-Id: If976d30b3371c4be2bcd33ab61268f21145232a1
Reviewed-on: https://chromium-review.googlesource.com/1030760Reviewed-by: default avatarDavid Dorwin <ddorwin@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554666}
parent 08fc5fdf
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
[ [
ImplementedAs=HTMLMediaElementEncryptedMedia ImplementedAs=HTMLMediaElementEncryptedMedia
] partial interface HTMLMediaElement { ] partial interface HTMLMediaElement {
readonly attribute MediaKeys mediaKeys; [SecureContext] readonly attribute MediaKeys mediaKeys;
[SecureContext, CallWith=ScriptState] Promise setMediaKeys(MediaKeys? mediaKeys); [SecureContext, CallWith=ScriptState] Promise setMediaKeys(MediaKeys? mediaKeys);
attribute EventHandler onencrypted; attribute EventHandler onencrypted;
attribute EventHandler onwaitingforkey; attribute EventHandler onwaitingforkey;
......
...@@ -33,7 +33,8 @@ enum MediaKeyMessageType { ...@@ -33,7 +33,8 @@ enum MediaKeyMessageType {
}; };
[ [
Constructor(DOMString type, MediaKeyMessageEventInit eventInitDict) Constructor(DOMString type, MediaKeyMessageEventInit eventInitDict),
SecureContext
] interface MediaKeyMessageEvent : Event { ] interface MediaKeyMessageEvent : Event {
readonly attribute MediaKeyMessageType messageType; readonly attribute MediaKeyMessageType messageType;
readonly attribute ArrayBuffer message; readonly attribute ArrayBuffer message;
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
*/ */
[ [
ActiveScriptWrappable ActiveScriptWrappable,
SecureContext
] interface MediaKeySession : EventTarget { ] interface MediaKeySession : EventTarget {
// session properties // session properties
readonly attribute DOMString sessionId; readonly attribute DOMString sessionId;
......
...@@ -14,7 +14,9 @@ enum MediaKeyStatus { ...@@ -14,7 +14,9 @@ enum MediaKeyStatus {
"internal-error" "internal-error"
}; };
interface MediaKeyStatusMap { [
SecureContext
] interface MediaKeyStatusMap {
iterable <BufferSource, MediaKeyStatus>; iterable <BufferSource, MediaKeyStatus>;
readonly attribute unsigned long size; readonly attribute unsigned long size;
boolean has(BufferSource keyId); boolean has(BufferSource keyId);
......
...@@ -4,7 +4,9 @@ ...@@ -4,7 +4,9 @@
// https://w3c.github.io/encrypted-media/#mediakeysystemaccess-interface // https://w3c.github.io/encrypted-media/#mediakeysystemaccess-interface
interface MediaKeySystemAccess { [
SecureContext
] interface MediaKeySystemAccess {
readonly attribute DOMString keySystem; readonly attribute DOMString keySystem;
MediaKeySystemConfiguration getConfiguration(); MediaKeySystemConfiguration getConfiguration();
[CallWith=ScriptState] Promise<MediaKeys> createMediaKeys(); [CallWith=ScriptState] Promise<MediaKeys> createMediaKeys();
......
...@@ -6,7 +6,8 @@ ...@@ -6,7 +6,8 @@
[ [
ImplementedAs=MediaKeysGetStatusForPolicy, ImplementedAs=MediaKeysGetStatusForPolicy,
RuntimeEnabled=EncryptedMediaHdcpPolicyCheck RuntimeEnabled=EncryptedMediaHdcpPolicyCheck,
SecureContext
] partial interface MediaKeys { ] partial interface MediaKeys {
[Measure, CallWith=ScriptState] Promise<MediaKeyStatus> getStatusForPolicy(MediaKeysPolicy policy); [Measure, CallWith=ScriptState] Promise<MediaKeyStatus> getStatusForPolicy(MediaKeysPolicy policy);
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment