Changeset 245357 in webkit

Timestamp:

May 15, 2019, 2:45:08 PM (7 years ago)

Author:

Alan Coon

Message:

Apply patch. rdar://problem/50352476

Location:

branches/safari-607-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/mediastream/MediaStreamTrack.h (modified) (1 diff)
• dom/Document.cpp (modified) (3 diffs)
• dom/Document.h (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• html/HTMLMediaElement.h (modified) (1 diff)
• page/MediaProducer.h (modified) (1 diff)

branches/safari-607-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-15  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Apply patch. rdar://problem/50352476
+
+    2019-05-15  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-05-14  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-607-branch/Source/WebCore/Modules/mediastream/MediaStreamTrack.h

@@ -51 +51 @@
     public ActiveDOMObject,
     public EventTargetWithInlineData,
-    public CanMakeWeakPtr<MediaStreamTrack>,
-    private MediaProducer,
+    public MediaProducer,
     private MediaStreamTrackPrivate::Observer {
 public:

branches/safari-607-branch/Source/WebCore/dom/Document.cpp

@@ -3981 +3981 @@
 void Document::addAudioProducer(MediaProducer* audioProducer)
 {
-    m_audioProducers.add(audioProducer);
+    m_audioProducers.add(audioProducer, makeWeakPtr(audioProducer));
     updateIsPlayingMedia();
 }
@@ -4006 +4006 @@
 {
     MediaProducer::MediaStateFlags state = MediaProducer::IsNotPlaying;
-    for (auto* audioProducer : m_audioProducers)
-        state |= audioProducer->mediaState();
+    for (auto& audioProducer : m_audioProducers.values()) {
+        if (audioProducer)
+            state |= audioProducer.get()->mediaState();
+    }
+    m_audioProducers.removeIf([](auto iterator) {
+        return !iterator.value;
+    });
 
 #if ENABLE(MEDIA_SESSION)
@@ -4048 +4053 @@
 void Document::pageMutedStateDidChange()
 {
-    for (auto* audioProducer : m_audioProducers)
-        audioProducer->pageMutedStateDidChange();
+    for (auto& audioProducer : m_audioProducers.values()) {
+        if (audioProducer)
+            audioProducer.get()->pageMutedStateDidChange();
+    }
+    m_audioProducers.removeIf([](auto iterator) {
+        return !iterator.value;
+    });
 }
 

branches/safari-607-branch/Source/WebCore/dom/Document.h

@@ -1909 +1909 @@
     Ref<CSSFontSelector> m_fontSelector;
 
-    HashSet<MediaProducer*> m_audioProducers;
+    HashMap<MediaProducer*, WeakPtr<MediaProducer>> m_audioProducers;
 
     HashSet<ShadowRoot*> m_inDocumentShadowRoots;

branches/safari-607-branch/Source/WebCore/html/HTMLMediaElement.cpp

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

branches/safari-607-branch/Source/WebCore/html/HTMLMediaElement.h

@@ -127 +127 @@
     , public ActiveDOMObject
     , public MediaControllerInterface
-    , public CanMakeWeakPtr<HTMLMediaElement>
     , public PlatformMediaSessionClient
     , private MediaCanStartListener
     , private MediaPlayerClient
-    , private MediaProducer
+    , public MediaProducer
     , private VisibilityChangeClient
     , private ApplicationStateChangeListener

branches/safari-607-branch/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 {