| 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/HTMLMediaElementEncryptedMedia.h" | 6 #include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/ExceptionState.h" | 8 #include "bindings/core/v8/ExceptionState.h" |
| 9 #include "bindings/core/v8/ScriptPromise.h" | 9 #include "bindings/core/v8/ScriptPromise.h" |
| 10 #include "bindings/core/v8/ScriptPromiseResolver.h" | 10 #include "bindings/core/v8/ScriptPromiseResolver.h" |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 SetMediaKeysHandler::SetMediaKeysHandler(ScriptState* scriptState, HTMLMediaElem
ent& element, MediaKeys* mediaKeys) | 136 SetMediaKeysHandler::SetMediaKeysHandler(ScriptState* scriptState, HTMLMediaElem
ent& element, MediaKeys* mediaKeys) |
| 137 : ScriptPromiseResolver(scriptState) | 137 : ScriptPromiseResolver(scriptState) |
| 138 , m_element(element) | 138 , m_element(element) |
| 139 , m_newMediaKeys(mediaKeys) | 139 , m_newMediaKeys(mediaKeys) |
| 140 , m_madeReservation(false) | 140 , m_madeReservation(false) |
| 141 , m_timer(this, &SetMediaKeysHandler::timerFired) | 141 , m_timer(this, &SetMediaKeysHandler::timerFired) |
| 142 { | 142 { |
| 143 WTF_LOG(Media, "SetMediaKeysHandler::SetMediaKeysHandler"); | 143 WTF_LOG(Media, "SetMediaKeysHandler::SetMediaKeysHandler"); |
| 144 | 144 |
| 145 // 3. Run the remaining steps asynchronously. | 145 // 3. Run the remaining steps asynchronously. |
| 146 m_timer.startOneShot(0, FROM_HERE); | 146 m_timer.startOneShot(0, BLINK_FROM_HERE); |
| 147 } | 147 } |
| 148 | 148 |
| 149 SetMediaKeysHandler::~SetMediaKeysHandler() | 149 SetMediaKeysHandler::~SetMediaKeysHandler() |
| 150 { | 150 { |
| 151 } | 151 } |
| 152 | 152 |
| 153 void SetMediaKeysHandler::timerFired(Timer<SetMediaKeysHandler>*) | 153 void SetMediaKeysHandler::timerFired(Timer<SetMediaKeysHandler>*) |
| 154 { | 154 { |
| 155 clearExistingMediaKeys(); | 155 clearExistingMediaKeys(); |
| 156 } | 156 } |
| (...skipping 469 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 } | 626 } |
| 627 | 627 |
| 628 DEFINE_TRACE(HTMLMediaElementEncryptedMedia) | 628 DEFINE_TRACE(HTMLMediaElementEncryptedMedia) |
| 629 { | 629 { |
| 630 visitor->trace(m_mediaElement); | 630 visitor->trace(m_mediaElement); |
| 631 visitor->trace(m_mediaKeys); | 631 visitor->trace(m_mediaKeys); |
| 632 WillBeHeapSupplement<HTMLMediaElement>::trace(visitor); | 632 WillBeHeapSupplement<HTMLMediaElement>::trace(visitor); |
| 633 } | 633 } |
| 634 | 634 |
| 635 } // namespace blink | 635 } // namespace blink |
| OLD | NEW |