Changeset 249018 in webkit

Timestamp:

Aug 22, 2019, 11:01:09 AM (7 years ago)

Author:

youenn@apple.com

Message:

Make MediaStreamTrackPrivate WeakPtrFactoryInitialization::Eager
​https://bugs.webkit.org/show_bug.cgi?id=201037

Reviewed by Darin Adler.

No change of behavior, replacing m_weakThis by the more convenient Eager.

• platform/mediastream/MediaStreamTrackPrivate.cpp:

(WebCore::MediaStreamTrackPrivate::audioSamplesAvailable):
(WebCore::MediaStreamTrackPrivate::MediaStreamTrackPrivate): Deleted.

• platform/mediastream/MediaStreamTrackPrivate.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/MediaStreamTrackPrivate.cpp (modified) (2 diffs)
• platform/mediastream/MediaStreamTrackPrivate.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-22  Youenn Fablet  <youenn@apple.com>
+
+        Make MediaStreamTrackPrivate WeakPtrFactoryInitialization::Eager
+        https://bugs.webkit.org/show_bug.cgi?id=201037
+
+        Reviewed by Darin Adler.
+
+        No change of behavior, replacing m_weakThis by the more convenient Eager.
+
+        * platform/mediastream/MediaStreamTrackPrivate.cpp:
+        (WebCore::MediaStreamTrackPrivate::audioSamplesAvailable):
+        (WebCore::MediaStreamTrackPrivate::MediaStreamTrackPrivate): Deleted.
+        * platform/mediastream/MediaStreamTrackPrivate.h:
+
 2019-08-17  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp

@@ -57 +57 @@
 
 MediaStreamTrackPrivate::MediaStreamTrackPrivate(Ref<const Logger>&& logger, Ref<RealtimeMediaSource>&& source, String&& id)
-    : m_weakThis(makeWeakPtr(*this))
-    , m_source(WTFMove(source))
+    : m_source(WTFMove(source))
     , m_id(WTFMove(id))
     , m_logger(WTFMove(logger))
@@ -266 +265 @@
 {
     if (!m_hasSentStartProducedData) {
-        callOnMainThread([this, weakThis = m_weakThis] {
+        callOnMainThread([this, weakThis = makeWeakPtr(this)] {
             if (!weakThis)
                 return;

trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h

@@ -44 +44 @@
 class MediaStreamTrackPrivate final
     : public ThreadSafeRefCounted<MediaStreamTrackPrivate, WTF::DestructionThread::Main>
-    , public CanMakeWeakPtr<MediaStreamTrackPrivate>
+    , public CanMakeWeakPtr<MediaStreamTrackPrivate, WeakPtrFactoryInitialization::Eager>
     , public RealtimeMediaSource::Observer
 #if !RELEASE_LOG_DISABLED
@@ -145 +145 @@
 #endif
 
-    WeakPtr<MediaStreamTrackPrivate> m_weakThis;
     mutable RecursiveLock m_observersLock;
     HashSet<Observer*> m_observers;