| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "modules/encryptedmedia/MediaKeySystemAccess.h" | 5 #include "modules/encryptedmedia/MediaKeySystemAccess.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/ScriptPromiseResolver.h" | 7 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 8 #include "bindings/core/v8/ScriptState.h" | 8 #include "bindings/core/v8/ScriptState.h" |
| 9 #include "core/dom/DOMException.h" | 9 #include "core/dom/DOMException.h" |
| 10 #include "core/dom/Document.h" | 10 #include "core/dom/Document.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 | 42 |
| 43 ~NewCdmResultPromise() override | 43 ~NewCdmResultPromise() override |
| 44 { | 44 { |
| 45 } | 45 } |
| 46 | 46 |
| 47 // ContentDecryptionModuleResult implementation. | 47 // ContentDecryptionModuleResult implementation. |
| 48 void completeWithContentDecryptionModule(WebContentDecryptionModule* cdm) ov
erride | 48 void completeWithContentDecryptionModule(WebContentDecryptionModule* cdm) ov
erride |
| 49 { | 49 { |
| 50 // NOTE: Continued from step 2.8 of createMediaKeys(). | 50 // NOTE: Continued from step 2.8 of createMediaKeys(). |
| 51 // 2.9. Let media keys be a new MediaKeys object. | 51 // 2.9. Let media keys be a new MediaKeys object. |
| 52 MediaKeys* mediaKeys = MediaKeys::create(executionContext(), m_supported
SessionTypes, adoptPtr(cdm)); | 52 MediaKeys* mediaKeys = MediaKeys::create(getExecutionContext(), m_suppor
tedSessionTypes, adoptPtr(cdm)); |
| 53 | 53 |
| 54 // 2.10. Resolve promise with media keys. | 54 // 2.10. Resolve promise with media keys. |
| 55 resolve(mediaKeys); | 55 resolve(mediaKeys); |
| 56 } | 56 } |
| 57 | 57 |
| 58 private: | 58 private: |
| 59 WebVector<WebEncryptedMediaSessionType> m_supportedSessionTypes; | 59 WebVector<WebEncryptedMediaSessionType> m_supportedSessionTypes; |
| 60 }; | 60 }; |
| 61 | 61 |
| 62 // These methods are the inverses of those with the same names in | 62 // These methods are the inverses of those with the same names in |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 | 162 |
| 163 // 3. Return promise. | 163 // 3. Return promise. |
| 164 return promise; | 164 return promise; |
| 165 } | 165 } |
| 166 | 166 |
| 167 DEFINE_TRACE(MediaKeySystemAccess) | 167 DEFINE_TRACE(MediaKeySystemAccess) |
| 168 { | 168 { |
| 169 } | 169 } |
| 170 | 170 |
| 171 } // namespace blink | 171 } // namespace blink |
| OLD | NEW |