Changeset 250773 in webkit

Timestamp:

Oct 7, 2019 7:14:12 AM (5 years ago)

Author:

youenn@apple.com

Message:

WebPageProxy::updatePlayingMediaDidChange should protect from a null m_userMediaPermissionRequestManager
​https://bugs.webkit.org/show_bug.cgi?id=202628
<rdar://problem/55935091>

Reviewed by Eric Carlson.

On process swap on navigation or process crash, m_userMediaPermissionRequestManager is made null.
At the same time, the media state is set back to not playing.
Future calls of updatePlayingMediaDidChange should not have any capture state change until getUserMedia/getDisplayMedia
is called, which would create m_userMediaPermissionRequestManager.
But this assumption is not always true given that the media state is computed as process-wide in MediaStreamTrack::captureState on iOS.
The above behavior is fixed as part of ​https://bugs.webkit.org/show_bug.cgi?id=202627.
Since the call to updatePlayingMediaDidChange is triggered straight from IPC, it should not be trusted and a null check should be added.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::updatePlayingMediaDidChange):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-10-07  youenn fablet  <youenn@apple.com>
+
+        WebPageProxy::updatePlayingMediaDidChange should protect from a null m_userMediaPermissionRequestManager
+        https://bugs.webkit.org/show_bug.cgi?id=202628
+        <rdar://problem/55935091>
+
+        Reviewed by Eric Carlson.
+
+        On process swap on navigation or process crash, m_userMediaPermissionRequestManager is made null.
+        At the same time, the media state is set back to not playing.
+        Future calls of updatePlayingMediaDidChange should not have any capture state change until getUserMedia/getDisplayMedia
+        is called, which would create m_userMediaPermissionRequestManager.
+        But this assumption is not always true given that the media state is computed as process-wide in MediaStreamTrack::captureState on iOS.
+        The above behavior is fixed as part of https://bugs.webkit.org/show_bug.cgi?id=202627.
+        Since the call to updatePlayingMediaDidChange is triggered straight from IPC, it should not be trusted and a null check should be added.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::updatePlayingMediaDidChange):
+
 2019-10-04  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -8307 +8307 @@
     if (oldMediaCaptureState != newMediaCaptureState) {
         m_uiClient->mediaCaptureStateDidChange(m_mediaState);
-        m_userMediaPermissionRequestManager->captureStateChanged(oldMediaCaptureState, newMediaCaptureState);
+        ASSERT(m_userMediaPermissionRequestManager);
+        if (m_userMediaPermissionRequestManager)
+            m_userMediaPermissionRequestManager->captureStateChanged(oldMediaCaptureState, newMediaCaptureState);
     }
 #endif