| Index: third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp
|
| diff --git a/third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp b/third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp
|
| index 1c0eaec0278f7946c650308d688bcbb89208e105..e5586d4f2f419e5f1baf3ed9bb5b18cee7f006b0 100644
|
| --- a/third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp
|
| +++ b/third_party/WebKit/Source/modules/mediastream/MediaDevices.cpp
|
| @@ -71,7 +71,7 @@ MediaDevices* MediaDevices::create(ExecutionContext* context) {
|
|
|
| MediaDevices::MediaDevices(ExecutionContext* context)
|
| : ActiveScriptWrappable(this),
|
| - ActiveDOMObject(context),
|
| + SuspendableObject(context),
|
| m_observing(false),
|
| m_stopped(false),
|
| m_dispatchScheduledEventRunner(AsyncMethodRunner<MediaDevices>::create(
|
| @@ -153,7 +153,7 @@ const AtomicString& MediaDevices::interfaceName() const {
|
| }
|
|
|
| ExecutionContext* MediaDevices::getExecutionContext() const {
|
| - return ActiveDOMObject::getExecutionContext();
|
| + return SuspendableObject::getExecutionContext();
|
| }
|
|
|
| void MediaDevices::removeAllEventListeners() {
|
| @@ -252,7 +252,7 @@ DEFINE_TRACE(MediaDevices) {
|
| visitor->trace(m_dispatchScheduledEventRunner);
|
| visitor->trace(m_scheduledEvents);
|
| EventTargetWithInlineData::trace(visitor);
|
| - ActiveDOMObject::trace(visitor);
|
| + SuspendableObject::trace(visitor);
|
| }
|
|
|
| } // namespace blink
|
|
|