Changeset 226171 in webkit

Timestamp:

Dec 19, 2017 7:17:24 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

UserMediaRequest should stop a request when Document is being stopped
​https://bugs.webkit.org/show_bug.cgi?id=180962

Patch by Youenn Fablet <​youenn@apple.com> on 2017-12-19
Reviewed by Eric Carlson.

Covered by fast/mediastream/destroy-document-while-enumerating-devices.html not crashing anymore under guardmalloc.
Stopping to wait for the media stream to be active whenDocument goes away.

• Modules/mediastream/UserMediaRequest.cpp:

(WebCore::UserMediaRequest::UserMediaRequest):
(WebCore::UserMediaRequest::stop):
(WebCore::UserMediaRequest::activeDOMObjectName const):
(WebCore::UserMediaRequest::canSuspendForDocumentSuspension const):
(WebCore::UserMediaRequest::contextDestroyed): Deleted.

• Modules/mediastream/UserMediaRequest.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/UserMediaRequest.cpp (modified) (7 diffs)
• Modules/mediastream/UserMediaRequest.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-19  Youenn Fablet  <youenn@apple.com>
+
+        UserMediaRequest should stop a request when Document is being stopped
+        https://bugs.webkit.org/show_bug.cgi?id=180962
+
+        Reviewed by Eric Carlson.
+
+        Covered by fast/mediastream/destroy-document-while-enumerating-devices.html not crashing anymore under guardmalloc.
+        Stopping to wait for the media stream to be active whenDocument goes away.
+
+        * Modules/mediastream/UserMediaRequest.cpp:
+        (WebCore::UserMediaRequest::UserMediaRequest):
+        (WebCore::UserMediaRequest::stop):
+        (WebCore::UserMediaRequest::activeDOMObjectName const):
+        (WebCore::UserMediaRequest::canSuspendForDocumentSuspension const):
+        (WebCore::UserMediaRequest::contextDestroyed): Deleted.
+        * Modules/mediastream/UserMediaRequest.h:
+
 2017-12-19  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp

@@ -61 +61 @@
 
 UserMediaRequest::UserMediaRequest(Document& document, MediaStreamRequest&& request, DOMPromiseDeferred<IDLInterface<MediaStream>>&& promise)
-    : ContextDestructionObserver(&document)
+    : ActiveDOMObject(&document)
     , m_promise(WTFMove(promise))
     , m_request(WTFMove(request))
 {
+    suspendIfNeeded();
 }
 
@@ -204 +205 @@
     RELEASE_LOG(MediaStream, "UserMediaRequest::allow %s %s", audioDevice ? audioDevice.persistentId().utf8().data() : "", videoDevice ? videoDevice.persistentId().utf8().data() : "");
 
-    auto callback = [this, protectedThis = makeRef(*this)](RefPtr<MediaStreamPrivate>&& privateStream) mutable {
+    auto callback = [this, protector = makePendingActivity(*this)](RefPtr<MediaStreamPrivate>&& privateStream) mutable {
         if (!m_scriptExecutionContext)
             return;
@@ -220 +221 @@
         }
 
-        m_pendingActivationMediaStream = PendingActivationMediaStream::create(WTFMove(protectedThis), WTFMove(stream));
+        m_pendingActivationMediaStream = PendingActivationMediaStream::create(WTFMove(protector), *this, WTFMove(stream));
     };
 
@@ -275 +276 @@
 }
 
-void UserMediaRequest::contextDestroyed()
-{
-    if (!m_scriptExecutionContext)
-        return;
-
+void UserMediaRequest::stop()
+{
     auto& document = downcast<Document>(*m_scriptExecutionContext);
     auto* controller = UserMediaController::from(document.page());
@@ -291 +289 @@
 }
 
+const char* UserMediaRequest::activeDOMObjectName() const
+{
+    return "UserMediaRequest";
+}
+
+bool UserMediaRequest::canSuspendForDocumentSuspension() const
+{
+    return !hasPendingActivity();
+}
+
 Document* UserMediaRequest::document() const
 {
@@ -296 +304 @@
 }
 
-UserMediaRequest::PendingActivationMediaStream::PendingActivationMediaStream(Ref<UserMediaRequest>&& request, Ref<MediaStream>&& stream)
-    : m_userMediaRequest(WTFMove(request))
+UserMediaRequest::PendingActivationMediaStream::PendingActivationMediaStream(Ref<PendingActivity<UserMediaRequest>>&& protectingUserMediaRequest, UserMediaRequest& userMediaRequest, Ref<MediaStream>&& stream)
+    : m_protectingUserMediaRequest(WTFMove(protectingUserMediaRequest))
+    , m_userMediaRequest(userMediaRequest)
     , m_mediaStream(WTFMove(stream))
 {
@@ -312 +321 @@
 {
     if (m_mediaStream->privateStream().hasVideo() || m_mediaStream->privateStream().hasAudio())
-        m_userMediaRequest->mediaStreamIsReady(m_mediaStream.copyRef());
+        m_userMediaRequest.mediaStreamIsReady(m_mediaStream.copyRef());
 }
 

trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.h

@@ -47 +47 @@
 class SecurityOrigin;
 
-class UserMediaRequest : public RefCounted<UserMediaRequest>, private ContextDestructionObserver {
+class UserMediaRequest : public RefCounted<UserMediaRequest>, public ActiveDOMObject {
 public:
     static RefPtr<UserMediaRequest> create(Document&, MediaStreamRequest&&, DOMPromiseDeferred<IDLInterface<MediaStream>>&&);
@@ -75 +75 @@
     UserMediaRequest(Document&, MediaStreamRequest&&, DOMPromiseDeferred<IDLInterface<MediaStream>>&&);
 
-    void contextDestroyed() final;
+    void stop() final;
+    const char* activeDOMObjectName() const final;
+    bool canSuspendForDocumentSuspension() const final;
 
     void mediaStreamIsReady(Ref<MediaStream>&&);
@@ -81 +83 @@
     class PendingActivationMediaStream : public RefCounted<PendingActivationMediaStream>, private MediaStreamPrivate::Observer {
     public:
-        static Ref<PendingActivationMediaStream> create(Ref<UserMediaRequest>&& request, Ref<MediaStream>&& stream)
+        static Ref<PendingActivationMediaStream> create(Ref<PendingActivity<UserMediaRequest>>&& protectingUserMediaRequest, UserMediaRequest& userMediaRequest, Ref<MediaStream>&& stream)
         {
-            return adoptRef(*new PendingActivationMediaStream { WTFMove(request), WTFMove(stream) });
+            return adoptRef(*new PendingActivationMediaStream { WTFMove(protectingUserMediaRequest), userMediaRequest, WTFMove(stream) });
         }
         ~PendingActivationMediaStream();
 
     private:
-        PendingActivationMediaStream(Ref<UserMediaRequest>&&, Ref<MediaStream>&&);
+        PendingActivationMediaStream(Ref<PendingActivity<UserMediaRequest>>&&, UserMediaRequest&, Ref<MediaStream>&&);
 
         void characteristicsChanged() final;
 
-        Ref<UserMediaRequest> m_userMediaRequest;
+        Ref<PendingActivity<UserMediaRequest>> m_protectingUserMediaRequest;
+        UserMediaRequest& m_userMediaRequest;
         Ref<MediaStream> m_mediaStream;
     };