| OLD | NEW |
| 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 { | 57 { |
| 58 ASSERT(result); | 58 ASSERT(result); |
| 59 ASSERT(serverCertificate); | 59 ASSERT(serverCertificate); |
| 60 return new PendingAction(result, serverCertificate); | 60 return new PendingAction(result, serverCertificate); |
| 61 } | 61 } |
| 62 | 62 |
| 63 ~PendingAction() | 63 ~PendingAction() |
| 64 { | 64 { |
| 65 } | 65 } |
| 66 | 66 |
| 67 void trace(Visitor* visitor) | 67 DEFINE_INLINE_TRACE() |
| 68 { | 68 { |
| 69 visitor->trace(m_result); | 69 visitor->trace(m_result); |
| 70 } | 70 } |
| 71 | 71 |
| 72 private: | 72 private: |
| 73 PendingAction(ContentDecryptionModuleResult* result, PassRefPtr<DOMArrayBuff
er> data) | 73 PendingAction(ContentDecryptionModuleResult* result, PassRefPtr<DOMArrayBuff
er> data) |
| 74 : m_result(result) | 74 : m_result(result) |
| 75 , m_data(data) | 75 , m_data(data) |
| 76 { | 76 { |
| 77 } | 77 } |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 // 5.4 Resolve promise. | 189 // 5.4 Resolve promise. |
| 190 // (These are handled by Chromium and the CDM.) | 190 // (These are handled by Chromium and the CDM.) |
| 191 } | 191 } |
| 192 } | 192 } |
| 193 | 193 |
| 194 WebContentDecryptionModule* MediaKeys::contentDecryptionModule() | 194 WebContentDecryptionModule* MediaKeys::contentDecryptionModule() |
| 195 { | 195 { |
| 196 return m_cdm.get(); | 196 return m_cdm.get(); |
| 197 } | 197 } |
| 198 | 198 |
| 199 void MediaKeys::trace(Visitor* visitor) | 199 DEFINE_TRACE(MediaKeys) |
| 200 { | 200 { |
| 201 visitor->trace(m_pendingActions); | 201 visitor->trace(m_pendingActions); |
| 202 ContextLifecycleObserver::trace(visitor); | 202 ContextLifecycleObserver::trace(visitor); |
| 203 } | 203 } |
| 204 | 204 |
| 205 void MediaKeys::contextDestroyed() | 205 void MediaKeys::contextDestroyed() |
| 206 { | 206 { |
| 207 ContextLifecycleObserver::contextDestroyed(); | 207 ContextLifecycleObserver::contextDestroyed(); |
| 208 | 208 |
| 209 // We don't need the CDM anymore. | 209 // We don't need the CDM anymore. |
| 210 m_cdm.clear(); | 210 m_cdm.clear(); |
| 211 } | 211 } |
| 212 | 212 |
| 213 } // namespace blink | 213 } // namespace blink |
| OLD | NEW |