Changeset 230292 in webkit

Timestamp:

Apr 4, 2018 7:40:49 PM (6 years ago)

Author:

youenn@apple.com

Message:

webrtc/video-update-often.html is flakily crashing on iOS simulator Debug
​https://bugs.webkit.org/show_bug.cgi?id=184022

Reviewed by Jer Noble.

Remove client context once the new context identifier is set.
Covered by test no longer crashing locally.

• WebProcess/cocoa/PlaybackSessionManager.mm:

(WebKit::PlaybackSessionManager::setUpPlaybackControlsManager):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/cocoa/PlaybackSessionManager.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-04-04  Youenn Fablet  <youenn@apple.com>
+
+        webrtc/video-update-often.html is flakily crashing on iOS simulator Debug
+        https://bugs.webkit.org/show_bug.cgi?id=184022
+
+        Reviewed by Jer Noble.
+
+        Remove client context once the new context identifier is set.
+        Covered by test no longer crashing locally.
+
+        * WebProcess/cocoa/PlaybackSessionManager.mm:
+        (WebKit::PlaybackSessionManager::setUpPlaybackControlsManager):
+
 2018-04-04  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/WebProcess/cocoa/PlaybackSessionManager.mm

@@ -257 +257 @@
             return;
 
-        if (m_controlsManagerContextId)
-            removeClientForContext(m_controlsManagerContextId);
+        auto previousContextId = m_controlsManagerContextId;
         m_controlsManagerContextId = contextId;
+        if (previousContextId)
+            removeClientForContext(previousContextId);
     } else {
-        auto addResult = m_mediaElements.ensure(&mediaElement, [&] { return nextContextId(); });
-        auto contextId = addResult.iterator->value;
-        if (m_controlsManagerContextId)
-            removeClientForContext(m_controlsManagerContextId);
+        auto contextId = m_mediaElements.ensure(&mediaElement, [&] { return nextContextId(); }).iterator->value;
+
+        auto previousContextId = m_controlsManagerContextId;
         m_controlsManagerContextId = contextId;
+        if (previousContextId)
+            removeClientForContext(previousContextId);
+
         ensureModel(contextId).setMediaElement(&mediaElement);
     }