Changeset 244815 in webkit

Timestamp:

Apr 30, 2019, 5:13:08 PM (7 years ago)

Author:

youenn@apple.com

Message:

Make Document audio producers use WeakPtr
​https://bugs.webkit.org/show_bug.cgi?id=197382

Reviewed by Eric Carlson.

Source/WebCore:

Move from a hash set of raw pointers to a hash set of weak pointers.
This helps make the code cleaner.
No observable change of behavior.

• Modules/mediastream/MediaStreamTrack.h:
• dom/Document.cpp:

(WebCore::Document::addAudioProducer):
(WebCore::Document::removeAudioProducer):
(WebCore::Document::updateIsPlayingMedia):
(WebCore::Document::pageMutedStateDidChange):

• dom/Document.h:
• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::updateActiveTextTrackCues):

• html/HTMLMediaElement.h:
• page/MediaProducer.h:

Source/WTF:

• wtf/WeakHashSet.h:

(WTF::WeakHashSet::hasNullReferences const):

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/WeakHashSet.h (modified) (2 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/mediastream/MediaStreamTrack.h (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (4 diffs)
• WebCore/dom/Document.h (modified) (2 diffs)
• WebCore/html/HTMLMediaElement.cpp (modified) (1 diff)
• WebCore/html/HTMLMediaElement.h (modified) (1 diff)
• WebCore/page/MediaProducer.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2019-04-30  Youenn Fablet  <youenn@apple.com>
+
+        Make Document audio producers use WeakPtr
+        https://bugs.webkit.org/show_bug.cgi?id=197382
+
+        Reviewed by Eric Carlson.
+
+        * wtf/WeakHashSet.h:
+        (WTF::WeakHashSet::hasNullReferences const):
+
 2019-04-30  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WTF/wtf/WeakHashSet.h

@@ -26 +26 @@
 #pragma once
 
+#include <wtf/Algorithms.h>
 #include <wtf/HashSet.h>
 #include <wtf/HashTraits.h>
@@ -124 +125 @@
     }
 
+    bool hasNullReferences() const
+    {
+        return WTF::anyOf(m_set, [] (auto& value) { return !value->get(); });
+    }
+
     unsigned computeSize() const
     {

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-30  Youenn Fablet  <youenn@apple.com>
+
+        Make Document audio producers use WeakPtr
+        https://bugs.webkit.org/show_bug.cgi?id=197382
+
+        Reviewed by Eric Carlson.
+
+        Move from a hash set of raw pointers to a hash set of weak pointers.
+        This helps make the code cleaner.
+        No observable change of behavior.
+
+        * Modules/mediastream/MediaStreamTrack.h:
+        * dom/Document.cpp:
+        (WebCore::Document::addAudioProducer):
+        (WebCore::Document::removeAudioProducer):
+        (WebCore::Document::updateIsPlayingMedia):
+        (WebCore::Document::pageMutedStateDidChange):
+        * dom/Document.h:
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::updateActiveTextTrackCues):
+        * html/HTMLMediaElement.h:
+        * page/MediaProducer.h:
+
 2019-04-30  Youenn Fablet  <youenn@apple.com>
 

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

@@ -52 +52 @@
     , public ActiveDOMObject
     , public EventTargetWithInlineData
-    , public CanMakeWeakPtr<MediaStreamTrack>
-    , private MediaProducer
+    , public MediaProducer
     , private MediaStreamTrackPrivate::Observer
 #if !RELEASE_LOG_DISABLED

trunk/Source/WebCore/dom/Document.cpp

@@ -3903 +3903 @@
 void Document::addAudioProducer(MediaProducer& audioProducer)
 {
-    m_audioProducers.add(&audioProducer);
+    m_audioProducers.add(audioProducer);
     updateIsPlayingMedia();
 }
@@ -3909 +3909 @@
 void Document::removeAudioProducer(MediaProducer& audioProducer)
 {
-    m_audioProducers.remove(&audioProducer);
+    m_audioProducers.remove(audioProducer);
     updateIsPlayingMedia();
 }
@@ -3928 +3928 @@
 {
     MediaProducer::MediaStateFlags state = MediaProducer::IsNotPlaying;
-    for (auto* audioProducer : m_audioProducers)
-        state |= audioProducer->mediaState();
+    for (auto& audioProducer : m_audioProducers)
+        state |= audioProducer.mediaState();
 
 #if ENABLE(MEDIA_SESSION)
@@ -3970 +3970 @@
 void Document::pageMutedStateDidChange()
 {
-    for (auto* audioProducer : m_audioProducers)
-        audioProducer->pageMutedStateDidChange();
+    for (auto& audioProducer : m_audioProducers)
+        audioProducer.pageMutedStateDidChange();
 }
 

trunk/Source/WebCore/dom/Document.h

@@ -67 +67 @@
 #include <wtf/ObjectIdentifier.h>
 #include <wtf/UniqueRef.h>
+#include <wtf/WeakHashSet.h>
 #include <wtf/WeakPtr.h>
 #include <wtf/text/AtomicStringHash.h>
@@ -1892 +1893 @@
     Ref<CSSFontSelector> m_fontSelector;
 
-    HashSet<MediaProducer*> m_audioProducers;
+    WeakHashSet<MediaProducer> m_audioProducers;
 
     HashSet<ShadowRoot*> m_inDocumentShadowRoots;

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -1769 +1769 @@
                 return;
 
-            auto currentMediaTime = weakThis->currentMediaTime();
+            auto currentMediaTime = this->currentMediaTime();
             INFO_LOG(LOGIDENTIFIER, " lambda, currentMediaTime: ", currentMediaTime);
-            weakThis->updateActiveTextTrackCues(currentMediaTime);
+            this->updateActiveTextTrackCues(currentMediaTime);
         }, nextInterestingTime);
     }

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -574 +574 @@
     enum class AutoplayEventPlaybackState { None, PreventedAutoplay, StartedWithUserGesture, StartedWithoutUserGesture };
 
+    using HTMLElement::weakPtrFactory;
+
 protected:
     HTMLMediaElement(const QualifiedName&, Document&, bool createdByParser);

trunk/Source/WebCore/page/MediaProducer.h

@@ -26 +26 @@
 #pragma once
 
+#include <wtf/WeakPtr.h>
+
 namespace WebCore {
 
-class MediaProducer {
+class MediaProducer : public CanMakeWeakPtr<MediaProducer> {
 public:
     enum MediaState {