Chromium Code Reviews| 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 "config.h" | 5 #include "config.h" |
| 6 #include "modules/encryptedmedia/MediaKeySystemAccess.h" | 6 #include "modules/encryptedmedia/MediaKeySystemAccess.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/ScriptPromiseResolver.h" | 8 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| 9 #include "bindings/core/v8/ScriptState.h" | 9 #include "bindings/core/v8/ScriptState.h" |
| 10 #include "core/dom/DOMException.h" | 10 #include "core/dom/DOMException.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 138 // 2.2 Load and initialize the cdm if necessary. | 138 // 2.2 Load and initialize the cdm if necessary. |
| 139 // 2.3 If cdm fails to load or initialize, reject promise with a new | 139 // 2.3 If cdm fails to load or initialize, reject promise with a new |
| 140 // DOMException whose name is the appropriate error name. | 140 // DOMException whose name is the appropriate error name. |
| 141 // (Done if completeWithException() called). | 141 // (Done if completeWithException() called). |
| 142 m_access->createContentDecryptionModule(helper->result()); | 142 m_access->createContentDecryptionModule(helper->result()); |
| 143 | 143 |
| 144 // 3. Return promise. | 144 // 3. Return promise. |
| 145 return promise; | 145 return promise; |
| 146 } | 146 } |
| 147 | 147 |
| 148 void MediaKeySystemAccess::trace(Visitor*) | 148 DEFINE_TRACE(MediaKeySystemAccess) |
|
haraken
2015/02/24 08:38:17
You can inline this.
| |
| 149 { | 149 { |
| 150 } | 150 } |
| 151 | 151 |
| 152 } // namespace blink | 152 } // namespace blink |
| OLD | NEW |