| Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp
|
| diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp
|
| index 903174dc62f920aac53fc554d7e5d9125707a6dd..c74c19ce3e3d69ed35e5064dc8bc5644d2514190 100644
|
| --- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp
|
| +++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp
|
| @@ -140,7 +140,7 @@ MediaKeys::MediaKeys(
|
| const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes,
|
| std::unique_ptr<WebContentDecryptionModule> cdm)
|
| : ActiveScriptWrappable(this),
|
| - ActiveDOMObject(context),
|
| + SuspendableObject(context),
|
| m_supportedSessionTypes(supportedSessionTypes),
|
| m_cdm(std::move(cdm)),
|
| m_mediaElement(nullptr),
|
| @@ -293,7 +293,7 @@ WebContentDecryptionModule* MediaKeys::contentDecryptionModule() {
|
| DEFINE_TRACE(MediaKeys) {
|
| visitor->trace(m_pendingActions);
|
| visitor->trace(m_mediaElement);
|
| - ActiveDOMObject::trace(visitor);
|
| + SuspendableObject::trace(visitor);
|
| }
|
|
|
| void MediaKeys::contextDestroyed() {
|
| @@ -301,7 +301,7 @@ void MediaKeys::contextDestroyed() {
|
| m_pendingActions.clear();
|
|
|
| // We don't need the CDM anymore. Only destroyed after all related
|
| - // ActiveDOMObjects have been stopped.
|
| + // SuspendableObjects have been stopped.
|
| m_cdm.reset();
|
| }
|
|
|
|
|