| 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 // parameter. | 153 // parameter. |
| 154 RefPtr<DOMArrayBuffer> serverCertificateBuffer = DOMArrayBuffer::create(serv
erCertificate.data(), serverCertificate.byteLength()); | 154 RefPtr<DOMArrayBuffer> serverCertificateBuffer = DOMArrayBuffer::create(serv
erCertificate.data(), serverCertificate.byteLength()); |
| 155 | 155 |
| 156 // 4. Let promise be a new promise. | 156 // 4. Let promise be a new promise. |
| 157 SimpleContentDecryptionModuleResultPromise* result = new SimpleContentDecryp
tionModuleResultPromise(scriptState); | 157 SimpleContentDecryptionModuleResultPromise* result = new SimpleContentDecryp
tionModuleResultPromise(scriptState); |
| 158 ScriptPromise promise = result->promise(); | 158 ScriptPromise promise = result->promise(); |
| 159 | 159 |
| 160 // 5. Run the following steps asynchronously (documented in timerFired()). | 160 // 5. Run the following steps asynchronously (documented in timerFired()). |
| 161 m_pendingActions.append(PendingAction::CreatePendingSetServerCertificate(res
ult, serverCertificateBuffer.release())); | 161 m_pendingActions.append(PendingAction::CreatePendingSetServerCertificate(res
ult, serverCertificateBuffer.release())); |
| 162 if (!m_timer.isActive()) | 162 if (!m_timer.isActive()) |
| 163 m_timer.startOneShot(0, FROM_HERE); | 163 m_timer.startOneShot(0, BLINK_FROM_HERE); |
| 164 | 164 |
| 165 // 6. Return promise. | 165 // 6. Return promise. |
| 166 return promise; | 166 return promise; |
| 167 } | 167 } |
| 168 | 168 |
| 169 bool MediaKeys::reserveForMediaElement(HTMLMediaElement* mediaElement) | 169 bool MediaKeys::reserveForMediaElement(HTMLMediaElement* mediaElement) |
| 170 { | 170 { |
| 171 // If some other HtmlMediaElement already has a reference to us, fail. | 171 // If some other HtmlMediaElement already has a reference to us, fail. |
| 172 if (m_mediaElement) | 172 if (m_mediaElement) |
| 173 return false; | 173 return false; |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 void MediaKeys::stop() | 264 void MediaKeys::stop() |
| 265 { | 265 { |
| 266 ActiveDOMObject::stop(); | 266 ActiveDOMObject::stop(); |
| 267 | 267 |
| 268 if (m_timer.isActive()) | 268 if (m_timer.isActive()) |
| 269 m_timer.stop(); | 269 m_timer.stop(); |
| 270 m_pendingActions.clear(); | 270 m_pendingActions.clear(); |
| 271 } | 271 } |
| 272 | 272 |
| 273 } // namespace blink | 273 } // namespace blink |
| OLD | NEW |