Index: third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp |
diff --git a/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp b/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp |
index 112d49387d54aa8b33939ef4291f7a2a00c87cce..e26d64d2c5fc31a8d709006c3e507cd812bd3bb2 100644 |
--- a/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp |
+++ b/third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp |
@@ -36,22 +36,16 @@ namespace blink { |
MediaDevicesRequest* MediaDevicesRequest::create(ScriptState* state, UserMediaController* controller) |
{ |
- MediaDevicesRequest* request = new MediaDevicesRequest(state, controller); |
- request->suspendIfNeeded(); |
- return request; |
+ return new MediaDevicesRequest(state, controller); |
} |
MediaDevicesRequest::MediaDevicesRequest(ScriptState* state, UserMediaController* controller) |
- : ActiveDOMObject(state->executionContext()) |
+ : ContextLifecycleObserver(state->executionContext()) |
, m_controller(controller) |
, m_resolver(ScriptPromiseResolver::create(state)) |
{ |
} |
-MediaDevicesRequest::~MediaDevicesRequest() |
-{ |
-} |
- |
Document* MediaDevicesRequest::ownerDocument() |
{ |
if (ExecutionContext* context = executionContext()) { |
@@ -77,7 +71,7 @@ void MediaDevicesRequest::succeed(const MediaDeviceInfoVector& mediaDevices) |
m_resolver->resolve(mediaDevices); |
} |
-void MediaDevicesRequest::stop() |
+void MediaDevicesRequest::contextDestroyed() |
{ |
m_controller.clear(); |
m_resolver.clear(); |
@@ -87,7 +81,7 @@ DEFINE_TRACE(MediaDevicesRequest) |
{ |
visitor->trace(m_controller); |
visitor->trace(m_resolver); |
- ActiveDOMObject::trace(visitor); |
+ ContextLifecycleObserver::trace(visitor); |
} |
} // namespace blink |