Changeset 248896 in webkit

Timestamp:

Aug 20, 2019 2:39:25 AM (5 years ago)

Author:

youenn@apple.com

Message:

PendingActivationMediaStream does not need to be refcounted
​https://bugs.webkit.org/show_bug.cgi?id=200879

Reviewed by Alex Christensen.

No observable change of behavior.

• Modules/mediastream/UserMediaRequest.cpp:

(WebCore::UserMediaRequest::allow):
(WebCore::UserMediaRequest::mediaStreamDidFail):
No need to asynchronously remove the observer since MediaStreamPrivate handles that properply now.

• Modules/mediastream/UserMediaRequest.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-20  Youenn Fablet  <youenn@apple.com>
+
+        PendingActivationMediaStream does not need to be refcounted
+        https://bugs.webkit.org/show_bug.cgi?id=200879
+
+        Reviewed by Alex Christensen.
+
+        No observable change of behavior.
+
+        * Modules/mediastream/UserMediaRequest.cpp:
+        (WebCore::UserMediaRequest::allow):
+        (WebCore::UserMediaRequest::mediaStreamDidFail):
+        No need to asynchronously remove the observer since MediaStreamPrivate handles that properply now.
+        * Modules/mediastream/UserMediaRequest.h:
+
 2019-08-19  Devin Rousso  <drousso@apple.com>
 

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

@@ -241 +241 @@
 
         scopeExit.release();
-        m_pendingActivationMediaStream = PendingActivationMediaStream::create(WTFMove(protector), *this, WTFMove(stream), WTFMove(completionHandler));
+        m_pendingActivationMediaStream = makeUnique<PendingActivationMediaStream>(WTFMove(protector), *this, WTFMove(stream), WTFMove(completionHandler));
     };
 
@@ -396 +396 @@
     }
     m_promise.reject(NotReadableError, makeString("Failed starting capture of a "_s, typeDescription, " track"_s));
-    // We are in an observer iterator loop, we do not want to change the observers within this loop.
-    callOnMainThread([stream = WTFMove(m_pendingActivationMediaStream)] { });
+    m_pendingActivationMediaStream = nullptr;
 }
 

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

@@ -83 +83 @@
     void mediaStreamDidFail(RealtimeMediaSource::Type);
 
-    class PendingActivationMediaStream : public RefCounted<PendingActivationMediaStream>, private MediaStreamPrivate::Observer {
+    class PendingActivationMediaStream : private MediaStreamPrivate::Observer {
+        WTF_MAKE_FAST_ALLOCATED;
     public:
-        static Ref<PendingActivationMediaStream> create(Ref<PendingActivity<UserMediaRequest>>&& protectingUserMediaRequest, UserMediaRequest& userMediaRequest, Ref<MediaStream>&& stream, CompletionHandler<void()>&& completionHandler)
-        {
-            return adoptRef(*new PendingActivationMediaStream { WTFMove(protectingUserMediaRequest), userMediaRequest, WTFMove(stream), WTFMove(completionHandler) });
-        }
+        PendingActivationMediaStream(Ref<PendingActivity<UserMediaRequest>>&&, UserMediaRequest&, Ref<MediaStream>&&, CompletionHandler<void()>&&);
         ~PendingActivationMediaStream();
 
     private:
-        PendingActivationMediaStream(Ref<PendingActivity<UserMediaRequest>>&&, UserMediaRequest&, Ref<MediaStream>&&, CompletionHandler<void()>&&);
-
         void characteristicsChanged() final;
 
@@ -106 +102 @@
 
     DOMPromiseDeferred<IDLInterface<MediaStream>> m_promise;
-    RefPtr<PendingActivationMediaStream> m_pendingActivationMediaStream;
+    std::unique_ptr<PendingActivationMediaStream> m_pendingActivationMediaStream;
     MediaStreamRequest m_request;
 };