Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: Source/modules/encryptedmedia/MediaKeys.cpp

Issue 19724003: Revert "Transition modules/** to use ExceptionState" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 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
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 14 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 15 * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 17 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 18 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 19 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 20 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "modules/encryptedmedia/MediaKeys.h" 27 #include "modules/encryptedmedia/MediaKeys.h"
28 28
29 #include "bindings/v8/ExceptionState.h"
30 #include "core/dom/EventNames.h" 29 #include "core/dom/EventNames.h"
31 #include "core/html/HTMLMediaElement.h" 30 #include "core/html/HTMLMediaElement.h"
32 #include "core/platform/UUID.h" 31 #include "core/platform/UUID.h"
33 #include "core/platform/graphics/ContentDecryptionModule.h" 32 #include "core/platform/graphics/ContentDecryptionModule.h"
34 #include "modules/encryptedmedia/MediaKeyMessageEvent.h" 33 #include "modules/encryptedmedia/MediaKeyMessageEvent.h"
35 #include "modules/encryptedmedia/MediaKeySession.h" 34 #include "modules/encryptedmedia/MediaKeySession.h"
36 #include "wtf/HashSet.h" 35 #include "wtf/HashSet.h"
37 36
38 namespace WebCore { 37 namespace WebCore {
39 38
40 PassRefPtr<MediaKeys> MediaKeys::create(const String& keySystem, ExceptionState& es) 39 PassRefPtr<MediaKeys> MediaKeys::create(const String& keySystem, ExceptionCode& ec)
41 { 40 {
42 // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/e ncrypted-media.html#dom-media-keys-constructor>: 41 // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/e ncrypted-media.html#dom-media-keys-constructor>:
43 // The MediaKeys(keySystem) constructor must run the following steps: 42 // The MediaKeys(keySystem) constructor must run the following steps:
44 43
45 // 1. If keySystem is null or an empty string, throw an InvalidAccessError e xception and abort these steps. 44 // 1. If keySystem is null or an empty string, throw an InvalidAccessError e xception and abort these steps.
46 if (keySystem.isEmpty()) { 45 if (keySystem.isEmpty()) {
47 es.throwDOMException(InvalidAccessError); 46 ec = InvalidAccessError;
48 return 0; 47 return 0;
49 } 48 }
50 49
51 // 2. If keySystem is not one of the user agent's supported Key Systems, thr ow a NotSupportedError and abort these steps. 50 // 2. If keySystem is not one of the user agent's supported Key Systems, thr ow a NotSupportedError and abort these steps.
52 if (!ContentDecryptionModule::supportsKeySystem(keySystem)) { 51 if (!ContentDecryptionModule::supportsKeySystem(keySystem)) {
53 es.throwDOMException(NotSupportedError); 52 ec = NotSupportedError;
54 return 0; 53 return 0;
55 } 54 }
56 55
57 // 3. Let cdm be the content decryption module corresponding to keySystem. 56 // 3. Let cdm be the content decryption module corresponding to keySystem.
58 // 4. Load cdm if necessary. 57 // 4. Load cdm if necessary.
59 OwnPtr<ContentDecryptionModule> cdm = ContentDecryptionModule::create(keySys tem); 58 OwnPtr<ContentDecryptionModule> cdm = ContentDecryptionModule::create(keySys tem);
60 if (!cdm) { 59 if (!cdm) {
61 es.throwDOMException(NotSupportedError); 60 ec = NotSupportedError;
62 return 0; 61 return 0;
63 } 62 }
64 63
65 // 5. Create a new MediaKeys object. 64 // 5. Create a new MediaKeys object.
66 // 5.1 Let the keySystem attribute be keySystem. 65 // 5.1 Let the keySystem attribute be keySystem.
67 // 6. Return the new object to the caller. 66 // 6. Return the new object to the caller.
68 return adoptRef(new MediaKeys(keySystem, cdm.release())); 67 return adoptRef(new MediaKeys(keySystem, cdm.release()));
69 } 68 }
70 69
71 MediaKeys::MediaKeys(const String& keySystem, PassOwnPtr<ContentDecryptionModule > cdm) 70 MediaKeys::MediaKeys(const String& keySystem, PassOwnPtr<ContentDecryptionModule > cdm)
72 : m_mediaElement(0) 71 : m_mediaElement(0)
73 , m_keySystem(keySystem) 72 , m_keySystem(keySystem)
74 , m_cdm(cdm) 73 , m_cdm(cdm)
75 { 74 {
76 ScriptWrappable::init(this); 75 ScriptWrappable::init(this);
77 } 76 }
78 77
79 MediaKeys::~MediaKeys() 78 MediaKeys::~MediaKeys()
80 { 79 {
81 // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/e ncrypted-media.html#dom-media-keys-constructor>: 80 // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/e ncrypted-media.html#dom-media-keys-constructor>:
82 // When destroying a MediaKeys object, follow the steps in close(). 81 // When destroying a MediaKeys object, follow the steps in close().
83 for (size_t i = 0; i < m_sessions.size(); ++i) 82 for (size_t i = 0; i < m_sessions.size(); ++i)
84 m_sessions[i]->close(); 83 m_sessions[i]->close();
85 } 84 }
86 85
87 PassRefPtr<MediaKeySession> MediaKeys::createSession(ScriptExecutionContext* con text, const String& type, Uint8Array* initData, ExceptionState& es) 86 PassRefPtr<MediaKeySession> MediaKeys::createSession(ScriptExecutionContext* con text, const String& type, Uint8Array* initData, ExceptionCode& ec)
88 { 87 {
89 // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/e ncrypted-media.html#dom-createsession>: 88 // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/e ncrypted-media.html#dom-createsession>:
90 // The createSession(type, initData) method must run the following steps: 89 // The createSession(type, initData) method must run the following steps:
91 // Note: The contents of initData are container-specific Initialization Data . 90 // Note: The contents of initData are container-specific Initialization Data .
92 91
93 // 1. If type is null or an empty string and initData is not null or an empt y string, throw an 92 // 1. If type is null or an empty string and initData is not null or an empt y string, throw an
94 // InvalidAccessError exception and abort these steps. 93 // InvalidAccessError exception and abort these steps.
95 if ((type.isEmpty()) && (!initData || initData->length())) { 94 if ((type.isEmpty()) && (!initData || initData->length())) {
96 es.throwDOMException(InvalidAccessError); 95 ec = InvalidAccessError;
97 return 0; 96 return 0;
98 } 97 }
99 98
100 // 2. If type contains a MIME type that is not supported or is not supported by the keySystem, throw 99 // 2. If type contains a MIME type that is not supported or is not supported by the keySystem, throw
101 // a NotSupportedError exception and abort these steps. 100 // a NotSupportedError exception and abort these steps.
102 ASSERT(!type.isEmpty()); 101 ASSERT(!type.isEmpty());
103 if (type.isEmpty() || !m_cdm->supportsMIMEType(type)) { 102 if (type.isEmpty() || !m_cdm->supportsMIMEType(type)) {
104 es.throwDOMException(NotSupportedError); 103 ec = NotSupportedError;
105 return 0; 104 return 0;
106 } 105 }
107 106
108 // 3. Create a new MediaKeySession object. 107 // 3. Create a new MediaKeySession object.
109 RefPtr<MediaKeySession> session = MediaKeySession::create(context, m_cdm.get (), this); 108 RefPtr<MediaKeySession> session = MediaKeySession::create(context, m_cdm.get (), this);
110 // 3.1 Let the keySystem attribute be keySystem. 109 // 3.1 Let the keySystem attribute be keySystem.
111 ASSERT(!session->keySystem().isEmpty()); 110 ASSERT(!session->keySystem().isEmpty());
112 // 3.2 Let the sessionId attribute be a unique Session ID string. It may be generated by cdm. 111 // 3.2 Let the sessionId attribute be a unique Session ID string. It may be generated by cdm.
113 // This is handled by m_cdm and may happen asynchronously. 112 // This is handled by m_cdm and may happen asynchronously.
114 113
115 // 4. Add the new object to an internal list of session objects. 114 // 4. Add the new object to an internal list of session objects.
116 m_sessions.append(session); 115 m_sessions.append(session);
117 116
118 // 5. Schedule a task to generate a key request, providing type, initData, a nd the new object. 117 // 5. Schedule a task to generate a key request, providing type, initData, a nd the new object.
119 session->generateKeyRequest(type, initData); 118 session->generateKeyRequest(type, initData);
120 119
121 // 6. Return the new object to the caller. 120 // 6. Return the new object to the caller.
122 return session; 121 return session;
123 } 122 }
124 123
125 void MediaKeys::setMediaElement(HTMLMediaElement* element) 124 void MediaKeys::setMediaElement(HTMLMediaElement* element)
126 { 125 {
127 // FIXME: Cause HTMLMediaElement::setMediaKeys() to throw an exception if m_ mediaElement is not 0. 126 // FIXME: Cause HTMLMediaElement::setMediaKeys() to throw an exception if m_ mediaElement is not 0.
128 // FIXME: Hook up the CDM to the WebMediaPlayer in Chromium. 127 // FIXME: Hook up the CDM to the WebMediaPlayer in Chromium.
129 ASSERT(!m_mediaElement); 128 ASSERT(!m_mediaElement);
130 m_mediaElement = element; 129 m_mediaElement = element;
131 } 130 }
132 131
133 } 132 }
OLDNEW
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeys.h ('k') | Source/modules/indexeddb/IDBFactoryBackendInterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698