| Index: third_party/WebCore/Modules/encryptedmedia/MediaKeySession.idl
|
| diff --git a/third_party/WebCore/dom/MessagePort.idl b/third_party/WebCore/Modules/encryptedmedia/MediaKeySession.idl
|
| similarity index 72%
|
| copy from third_party/WebCore/dom/MessagePort.idl
|
| copy to third_party/WebCore/Modules/encryptedmedia/MediaKeySession.idl
|
| index bbd48c0ede21d8e127713d3ae140874d4c43bf10..c4c9fc2b83ba8dfe9d44ad177687dfaf0e59c0b9 100644
|
| --- a/third_party/WebCore/dom/MessagePort.idl
|
| +++ b/third_party/WebCore/Modules/encryptedmedia/MediaKeySession.idl
|
| @@ -1,6 +1,5 @@
|
| /*
|
| - * Copyright (C) 2008 Apple Inc. All Rights Reserved.
|
| - * Copyright (C) 2011 Google Inc. All Rights Reserved.
|
| + * Copyright (C) 2013 Apple Inc. All rights reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions
|
| @@ -22,27 +21,29 @@
|
| * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - *
|
| - */
|
| + */
|
|
|
| -[
|
| - JSCustomMarkFunction,
|
| - JSGenerateIsReachable=Impl,
|
| - ActiveDOMObject,
|
| +interface [
|
| + Conditional=ENCRYPTED_MEDIA_V2,
|
| + V8EnabledAtRuntime=encryptedMedia,
|
| EventTarget,
|
| - JSNoStaticTables
|
| -] interface MessagePort {
|
| -// We need to have something as an ObjC binding, because MessagePort is used in MessageEvent, which already has one,
|
| -// but we don't want to actually expose the API while it is in flux.
|
| -#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
|
| - [Custom] void postMessage(in any message, in [Optional] Array messagePorts)
|
| - raises(DOMException);
|
| +] MediaKeySession {
|
| + // error state
|
| + readonly attribute MediaKeyError error;
|
|
|
| - void start();
|
| - void close();
|
| + // session properties
|
| + readonly attribute DOMString keySystem;
|
| + readonly attribute DOMString sessionId;
|
|
|
| - // event handler attributes
|
| - attribute EventListener onmessage;
|
| + // session operations
|
| + void update(in Uint8Array key)
|
| + raises(DOMException);
|
| + void close();
|
| +
|
| + // EventListeners
|
| + attribute [V8EnabledAtRuntime=encryptedMedia] EventListener onwebkitkeyadded;
|
| + attribute [V8EnabledAtRuntime=encryptedMedia] EventListener onwebkitkeyerror;
|
| + attribute [V8EnabledAtRuntime=encryptedMedia] EventListener onwebkitkeymessage;
|
|
|
| // EventTarget interface
|
| void addEventListener(in DOMString type,
|
| @@ -53,6 +54,4 @@
|
| in [Optional] boolean useCapture);
|
| boolean dispatchEvent(in Event evt)
|
| raises(EventException);
|
| -#endif
|
| };
|
| -
|
|
|