Changeset 245935 in webkit

Timestamp:

May 30, 2019, 5:33:35 PM (7 years ago)

Author:

Alan Coon

Message:

Apply patch. rdar://problem/51264770

Location:

branches/safari-607-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/cocoa/UserMediaCaptureManager.cpp (modified) (4 diffs)

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

@@ +1 @@
+2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Apply patch. rdar://problem/51264770
+
+    2019-05-30  Youenn Fablet  <youenn@apple.com>
+
+            UserMediaCaptureManager should remove a source from its map once the source is ended
+            https://bugs.webkit.org/show_bug.cgi?id=198337
+
+            When the source is stopped, for instance using MediaStreamTrack.stop,
+            remove the source from UserMediaCaptureManager sources map.
+            This makes sure the map will not grow over time.
+            Add an if check to ensure that the source is still there before processing an incoming IPC call.
+
+            When UIProcess tells us the capture is finished (typically capture failed), remove the entry on WebProcess side as well.
+
+            * WebProcess/cocoa/UserMediaCaptureManager.cpp:
+            (WebKit::UserMediaCaptureManager::createCaptureSource):
+            (WebKit::UserMediaCaptureManager::sourceStopped):
+            (WebKit::UserMediaCaptureManager::captureFailed):
+            (WebKit::UserMediaCaptureManager::sourceMutedChanged):
+            (WebKit::UserMediaCaptureManager::sourceSettingsChanged):
+            (WebKit::UserMediaCaptureManager::storageChanged):
+            (WebKit::UserMediaCaptureManager::ringBufferFrameBoundsChanged):
+            (WebKit::UserMediaCaptureManager::audioSamplesAvailable):
+            (WebKit::UserMediaCaptureManager::remoteVideoSampleAvailable):
+            (WebKit::UserMediaCaptureManager::sourceEnded):
+            (WebKit::UserMediaCaptureManager::applyConstraintsSucceeded):
+            (WebKit::UserMediaCaptureManager::applyConstraintsFailed):
+
 2019-05-30  Kocsen Chung  <kocsen_chung@apple.com>
 

branches/safari-607-branch/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp

@@ -254 +254 @@
     auto source = adoptRef(*new Source(String::number(id), type, String { settings.label() }, WTFMove(hashSalt), id, *this));
     source->setSettings(WTFMove(settings));
-    m_sources.set(id, source.copyRef());
+    m_sources.add(id, source.copyRef());
     return WebCore::CaptureSourceOrError(WTFMove(source));
 }
@@ -260 +260 @@
 void UserMediaCaptureManager::sourceStopped(uint64_t id)
 {
-    ASSERT(m_sources.contains(id));
-    m_sources.get(id)->stop();
+    if (auto source = m_sources.get(id))
+        source->stop();
 }
 
 void UserMediaCaptureManager::captureFailed(uint64_t id)
 {
-    ASSERT(m_sources.contains(id));
-    m_sources.get(id)->captureFailed();
+    if (auto source = m_sources.get(id))
+        source->captureFailed();
 }
 
 void UserMediaCaptureManager::sourceMutedChanged(uint64_t id, bool muted)
 {
-    ASSERT(m_sources.contains(id));
-    m_sources.get(id)->setMuted(muted);
+    if (auto source = m_sources.get(id))
+        source->setMuted(muted);
 }
 
 void UserMediaCaptureManager::sourceSettingsChanged(uint64_t id, const RealtimeMediaSourceSettings& settings)
 {
-    ASSERT(m_sources.contains(id));
-    m_sources.get(id)->setSettings(RealtimeMediaSourceSettings(settings));
+    if (auto source = m_sources.get(id))
+        source->setSettings(RealtimeMediaSourceSettings(settings));
 }
 
 void UserMediaCaptureManager::storageChanged(uint64_t id, const SharedMemory::Handle& handle, const WebCore::CAAudioStreamDescription& description, uint64_t numberOfFrames)
 {
-    ASSERT(m_sources.contains(id));
-    m_sources.get(id)->setStorage(handle, description, numberOfFrames);
+    if (auto source = m_sources.get(id))
+        source->setStorage(handle, description, numberOfFrames);
 }
 
 void UserMediaCaptureManager::ringBufferFrameBoundsChanged(uint64_t id, uint64_t startFrame, uint64_t endFrame)
 {
-    ASSERT(m_sources.contains(id));
-    m_sources.get(id)->setRingBufferFrameBounds(startFrame, endFrame);
+    if (auto source = m_sources.get(id))
+        source->setRingBufferFrameBounds(startFrame, endFrame);
 }
 
 void UserMediaCaptureManager::audioSamplesAvailable(uint64_t id, MediaTime time, uint64_t numberOfFrames, uint64_t startFrame, uint64_t endFrame)
 {
-    ASSERT(m_sources.contains(id));
-    auto& source = *m_sources.get(id);
-    source.setRingBufferFrameBounds(startFrame, endFrame);
-    source.audioSamplesAvailable(time, numberOfFrames);
+    if (auto source = m_sources.get(id)) {
+        source->setRingBufferFrameBounds(startFrame, endFrame);
+        source->audioSamplesAvailable(time, numberOfFrames);
+    }
 }
 
@@ -305 +305 @@
 void UserMediaCaptureManager::remoteVideoSampleAvailable(uint64_t id, RemoteVideoSample&& sample)
 {
-    ASSERT(m_sources.contains(id));
-    m_sources.get(id)->remoteVideoSampleAvailable(WTFMove(sample));
+    if (auto source = m_sources.get(id))
+        source->remoteVideoSampleAvailable(WTFMove(sample));
 }
 #else
@@ -344 +344 @@
 void UserMediaCaptureManager::applyConstraintsSucceeded(uint64_t id, const WebCore::RealtimeMediaSourceSettings& settings)
 {
-    ASSERT(m_sources.contains(id));
-    auto& source = *m_sources.get(id);
-    source.applyConstraintsSucceeded(settings);
+    if (auto source = m_sources.get(id))
+        source->applyConstraintsSucceeded(settings);
 }
 
 void UserMediaCaptureManager::applyConstraintsFailed(uint64_t id, const String& failedConstraint, const String& message)
 {
-    ASSERT(m_sources.contains(id));
-    auto& source = *m_sources.get(id);
-    source.applyConstraintsFailed(failedConstraint, message);
+    if (auto source = m_sources.get(id))
+        source->applyConstraintsFailed(failedConstraint, message);
 }