Title: [249018] trunk/Source/WebCore
Revision
249018
Author
[email protected]
Date
2019-08-22 11:01:09 -0700 (Thu, 22 Aug 2019)

Log 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:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (249017 => 249018)


--- trunk/Source/WebCore/ChangeLog	2019-08-22 17:35:06 UTC (rev 249017)
+++ trunk/Source/WebCore/ChangeLog	2019-08-22 18:01:09 UTC (rev 249018)
@@ -1,3 +1,17 @@
+2019-08-22  Youenn Fablet  <[email protected]>
+
+        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  <[email protected]>
 
         Use makeString and multi-argument StringBuilder::append instead of less efficient multiple appends

Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp (249017 => 249018)


--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp	2019-08-22 17:35:06 UTC (rev 249017)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.cpp	2019-08-22 18:01:09 UTC (rev 249018)
@@ -56,8 +56,7 @@
 }
 
 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))
 #if !RELEASE_LOG_DISABLED
@@ -265,7 +264,7 @@
 void MediaStreamTrackPrivate::audioSamplesAvailable(const MediaTime& mediaTime, const PlatformAudioData& data, const AudioStreamDescription& description, size_t sampleCount)
 {
     if (!m_hasSentStartProducedData) {
-        callOnMainThread([this, weakThis = m_weakThis] {
+        callOnMainThread([this, weakThis = makeWeakPtr(this)] {
             if (!weakThis)
                 return;
 

Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h (249017 => 249018)


--- trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h	2019-08-22 17:35:06 UTC (rev 249017)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamTrackPrivate.h	2019-08-22 18:01:09 UTC (rev 249018)
@@ -43,7 +43,7 @@
 
 class MediaStreamTrackPrivate final
     : public ThreadSafeRefCounted<MediaStreamTrackPrivate, WTF::DestructionThread::Main>
-    , public CanMakeWeakPtr<MediaStreamTrackPrivate>
+    , public CanMakeWeakPtr<MediaStreamTrackPrivate, WeakPtrFactoryInitialization::Eager>
     , public RealtimeMediaSource::Observer
 #if !RELEASE_LOG_DISABLED
     , private LoggerHelper
@@ -144,7 +144,6 @@
     WTFLogChannel& logChannel() const final;
 #endif
 
-    WeakPtr<MediaStreamTrackPrivate> m_weakThis;
     mutable RecursiveLock m_observersLock;
     HashSet<Observer*> m_observers;
     Ref<RealtimeMediaSource> m_source;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to