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

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

Issue 72363002: Rename es => exceptionState in other than bindings/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Retry Created 7 years, 1 month 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
(...skipping 19 matching lines...) Expand all
30 #include "core/events/ThreadLocalEventNames.h" 30 #include "core/events/ThreadLocalEventNames.h"
31 #include "core/html/HTMLMediaElement.h" 31 #include "core/html/HTMLMediaElement.h"
32 #include "modules/encryptedmedia/MediaKeyMessageEvent.h" 32 #include "modules/encryptedmedia/MediaKeyMessageEvent.h"
33 #include "modules/encryptedmedia/MediaKeySession.h" 33 #include "modules/encryptedmedia/MediaKeySession.h"
34 #include "platform/UUID.h" 34 #include "platform/UUID.h"
35 #include "platform/drm/ContentDecryptionModule.h" 35 #include "platform/drm/ContentDecryptionModule.h"
36 #include "wtf/HashSet.h" 36 #include "wtf/HashSet.h"
37 37
38 namespace WebCore { 38 namespace WebCore {
39 39
40 PassRefPtr<MediaKeys> MediaKeys::create(const String& keySystem, ExceptionState& es) 40 PassRefPtr<MediaKeys> MediaKeys::create(const String& keySystem, ExceptionState& exceptionState)
41 { 41 {
42 // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/e ncrypted-media.html#dom-media-keys-constructor>: 42 // 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: 43 // The MediaKeys(keySystem) constructor must run the following steps:
44 44
45 // 1. If keySystem is null or an empty string, throw an InvalidAccessError e xception and abort these steps. 45 // 1. If keySystem is null or an empty string, throw an InvalidAccessError e xception and abort these steps.
46 if (keySystem.isEmpty()) { 46 if (keySystem.isEmpty()) {
47 es.throwUninformativeAndGenericDOMException(InvalidAccessError); 47 exceptionState.throwUninformativeAndGenericDOMException(InvalidAccessErr or);
48 return 0; 48 return 0;
49 } 49 }
50 50
51 // 2. If keySystem is not one of the user agent's supported Key Systems, thr ow a NotSupportedError and abort these steps. 51 // 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)) { 52 if (!ContentDecryptionModule::supportsKeySystem(keySystem)) {
53 es.throwUninformativeAndGenericDOMException(NotSupportedError); 53 exceptionState.throwUninformativeAndGenericDOMException(NotSupportedErro r);
54 return 0; 54 return 0;
55 } 55 }
56 56
57 // 3. Let cdm be the content decryption module corresponding to keySystem. 57 // 3. Let cdm be the content decryption module corresponding to keySystem.
58 // 4. Load cdm if necessary. 58 // 4. Load cdm if necessary.
59 OwnPtr<ContentDecryptionModule> cdm = ContentDecryptionModule::create(keySys tem); 59 OwnPtr<ContentDecryptionModule> cdm = ContentDecryptionModule::create(keySys tem);
60 if (!cdm) { 60 if (!cdm) {
61 es.throwUninformativeAndGenericDOMException(NotSupportedError); 61 exceptionState.throwUninformativeAndGenericDOMException(NotSupportedErro r);
62 return 0; 62 return 0;
63 } 63 }
64 64
65 // 5. Create a new MediaKeys object. 65 // 5. Create a new MediaKeys object.
66 // 5.1 Let the keySystem attribute be keySystem. 66 // 5.1 Let the keySystem attribute be keySystem.
67 // 6. Return the new object to the caller. 67 // 6. Return the new object to the caller.
68 return adoptRef(new MediaKeys(keySystem, cdm.release())); 68 return adoptRef(new MediaKeys(keySystem, cdm.release()));
69 } 69 }
70 70
71 MediaKeys::MediaKeys(const String& keySystem, PassOwnPtr<ContentDecryptionModule > cdm) 71 MediaKeys::MediaKeys(const String& keySystem, PassOwnPtr<ContentDecryptionModule > cdm)
72 : m_mediaElement(0) 72 : m_mediaElement(0)
73 , m_keySystem(keySystem) 73 , m_keySystem(keySystem)
74 , m_cdm(cdm) 74 , m_cdm(cdm)
75 { 75 {
76 ScriptWrappable::init(this); 76 ScriptWrappable::init(this);
77 } 77 }
78 78
79 MediaKeys::~MediaKeys() 79 MediaKeys::~MediaKeys()
80 { 80 {
81 // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/e ncrypted-media.html#dom-media-keys-constructor>: 81 // 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(). 82 // When destroying a MediaKeys object, follow the steps in close().
83 for (size_t i = 0; i < m_sessions.size(); ++i) 83 for (size_t i = 0; i < m_sessions.size(); ++i)
84 m_sessions[i]->close(); 84 m_sessions[i]->close();
85 } 85 }
86 86
87 PassRefPtr<MediaKeySession> MediaKeys::createSession(ExecutionContext* context, const String& type, Uint8Array* initData, ExceptionState& es) 87 PassRefPtr<MediaKeySession> MediaKeys::createSession(ExecutionContext* context, const String& type, Uint8Array* initData, ExceptionState& exceptionState)
88 { 88 {
89 // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/e ncrypted-media.html#dom-createsession>: 89 // 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: 90 // The createSession(type, initData) method must run the following steps:
91 // Note: The contents of initData are container-specific Initialization Data . 91 // Note: The contents of initData are container-specific Initialization Data .
92 92
93 // 1. If type is null or an empty string and initData is not null or an empt y string, throw an 93 // 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. 94 // InvalidAccessError exception and abort these steps.
95 if ((type.isEmpty()) && (!initData || initData->length())) { 95 if ((type.isEmpty()) && (!initData || initData->length())) {
96 es.throwUninformativeAndGenericDOMException(InvalidAccessError); 96 exceptionState.throwUninformativeAndGenericDOMException(InvalidAccessErr or);
97 return 0; 97 return 0;
98 } 98 }
99 99
100 // 2. If type contains a MIME type that is not supported or is not supported by the keySystem, throw 100 // 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. 101 // a NotSupportedError exception and abort these steps.
102 ASSERT(!type.isEmpty()); 102 ASSERT(!type.isEmpty());
103 if (type.isEmpty() || !m_cdm->supportsMIMEType(type)) { 103 if (type.isEmpty() || !m_cdm->supportsMIMEType(type)) {
104 es.throwUninformativeAndGenericDOMException(NotSupportedError); 104 exceptionState.throwUninformativeAndGenericDOMException(NotSupportedErro r);
105 return 0; 105 return 0;
106 } 106 }
107 107
108 // 3. Create a new MediaKeySession object. 108 // 3. Create a new MediaKeySession object.
109 RefPtr<MediaKeySession> session = MediaKeySession::create(context, m_cdm.get (), this); 109 RefPtr<MediaKeySession> session = MediaKeySession::create(context, m_cdm.get (), this);
110 // 3.1 Let the keySystem attribute be keySystem. 110 // 3.1 Let the keySystem attribute be keySystem.
111 ASSERT(!session->keySystem().isEmpty()); 111 ASSERT(!session->keySystem().isEmpty());
112 // 3.2 Let the sessionId attribute be a unique Session ID string. It may be generated by cdm. 112 // 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. 113 // This is handled by m_cdm and may happen asynchronously.
114 114
115 // 4. Add the new object to an internal list of session objects. 115 // 4. Add the new object to an internal list of session objects.
116 m_sessions.append(session); 116 m_sessions.append(session);
117 117
118 // 5. Schedule a task to generate a key request, providing type, initData, a nd the new object. 118 // 5. Schedule a task to generate a key request, providing type, initData, a nd the new object.
119 session->generateKeyRequest(type, initData); 119 session->generateKeyRequest(type, initData);
120 120
121 // 6. Return the new object to the caller. 121 // 6. Return the new object to the caller.
122 return session; 122 return session;
123 } 123 }
124 124
125 void MediaKeys::setMediaElement(HTMLMediaElement* element) 125 void MediaKeys::setMediaElement(HTMLMediaElement* element)
126 { 126 {
127 // FIXME: Cause HTMLMediaElement::setMediaKeys() to throw an exception if m_ mediaElement is not 0. 127 // 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. 128 // FIXME: Hook up the CDM to the WebMediaPlayer in Chromium.
129 ASSERT(!m_mediaElement); 129 ASSERT(!m_mediaElement);
130 m_mediaElement = element; 130 m_mediaElement = element;
131 } 131 }
132 132
133 } 133 }
OLDNEW
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeySession.cpp ('k') | Source/modules/filesystem/DOMFileSystemSync.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698