Changeset 271640 in webkit

Timestamp:

Jan 20, 2021 12:57:03 AM (18 months ago)

Author:

youenn@apple.com

Message:

On page close, make sure to notify of capture state immediately
​https://bugs.webkit.org/show_bug.cgi?id=220588

Reviewed by Geoffrey Garen.

Source/WebKit:

If page is getting closed or reset (for instance in case of process swap), we immediately notify the client of the capture state,
instead of waiting for 3 seconds if capture just started.

Covered by API test.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::isPlayingMediaDidChange):
(WebKit::WebPageProxy::updatePlayingMediaDidChange):
(WebKit::WebPageProxy::updateReportedMediaCaptureState):

• UIProcess/WebPageProxy.h:

Tools:

• TestWebKitAPI/Tests/WebKit/GetUserMedia.mm:

(TestWebKitAPI::TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/WebPageProxy.cpp (modified) (3 diffs)
• Source/WebKit/UIProcess/WebPageProxy.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit/GetUserMedia.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-01-20  Youenn Fablet  <youenn@apple.com>
+
+        On page close, make sure to notify of capture state immediately
+        https://bugs.webkit.org/show_bug.cgi?id=220588
+
+        Reviewed by Geoffrey Garen.
+
+        If page is getting closed or reset (for instance in case of process swap), we immediately notify the client of the capture state,
+        instead of waiting for 3 seconds if capture just started.
+
+        Covered by API test.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::isPlayingMediaDidChange):
+        (WebKit::WebPageProxy::updatePlayingMediaDidChange):
+        (WebKit::WebPageProxy::updateReportedMediaCaptureState):
+        * UIProcess/WebPageProxy.h:
+
 2021-01-19  Sihui Liu  <sihui_liu@appe.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -9034 +9034 @@
 
     if (!m_isClosed)
-        updatePlayingMediaDidChange(newState);
-}
-
-void WebPageProxy::updatePlayingMediaDidChange(MediaProducer::MediaStateFlags newState)
-{
-    if (newState == m_mediaState)
-        return;
+        updatePlayingMediaDidChange(newState, CanDelayNotification::Yes);
+}
+
+void WebPageProxy::updatePlayingMediaDidChange(MediaProducer::MediaStateFlags newState, CanDelayNotification canDelayNotification)
+{
+#if ENABLE(MEDIA_STREAM)
+    auto updateMediaCaptureStateImmediatelyIfNeeded = [&] {
+        if (canDelayNotification == CanDelayNotification::No && m_updateReportedMediaCaptureStateTimer.isActive()) {
+            m_updateReportedMediaCaptureStateTimer.stop();
+            updateReportedMediaCaptureState();
+        }
+    };
+#endif
+
+    if (newState == m_mediaState) {
+#if ENABLE(MEDIA_STREAM)
+        updateMediaCaptureStateImmediatelyIfNeeded();
+#endif
+        return;
+    }
 
 #if PLATFORM(MACCATALYST)
@@ -9075 +9088 @@
             m_userMediaPermissionRequestManager->captureStateChanged(oldMediaCaptureState, newMediaCaptureState);
     }
+    updateMediaCaptureStateImmediatelyIfNeeded();
 #endif
 
@@ -9103 +9117 @@
     if (!haveReportedCapture && willReportCapture)
         m_updateReportedMediaCaptureStateTimer.startOneShot(m_mediaCaptureReportingDelay);
+
+    RELEASE_LOG_IF_ALLOWED(WebRTC, "updateReportedMediaCaptureState: from %d to %d", m_reportedMediaCaptureState, activeCaptureState);
 
     m_reportedMediaCaptureState = activeCaptureState;

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -1441 +1441 @@
     void updateReportedMediaCaptureState();
 
-    void updatePlayingMediaDidChange(WebCore::MediaProducer::MediaStateFlags);
+    enum class CanDelayNotification { No, Yes };
+    void updatePlayingMediaDidChange(WebCore::MediaProducer::MediaStateFlags, CanDelayNotification = CanDelayNotification::No);
     bool isCapturingAudio() const { return m_mediaState & WebCore::MediaProducer::AudioCaptureMask; }
     bool isCapturingVideo() const { return m_mediaState & WebCore::MediaProducer::VideoCaptureMask; }

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-20  Youenn Fablet  <youenn@apple.com>
+
+        On page close, make sure to notify of capture state immediately
+        https://bugs.webkit.org/show_bug.cgi?id=220588
+
+        Reviewed by Geoffrey Garen.
+
+        * TestWebKitAPI/Tests/WebKit/GetUserMedia.mm:
+        (TestWebKitAPI::TEST):
+
 2021-01-19  Sihui Liu  <sihui_liu@appe.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit/GetUserMedia.mm

@@ -240 +240 @@
     // One additional second should allow us to go back to no capture being reported.
     EXPECT_TRUE(waitUntilCaptureState(webView, _WKMediaCaptureStateNone));
-
+}
+
+TEST(WebKit2, CaptureIndicatorDelayWhenClosed)
+{
+    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
+    auto processPoolConfig = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
+    auto preferences = [configuration preferences];
+    preferences._mediaCaptureRequiresSecureConnection = NO;
+    configuration.get()._mediaCaptureEnabled = YES;
+    preferences._mockCaptureDevicesEnabled = YES;
+
+    auto messageHandler = adoptNS([[GUMMessageHandler alloc] init]);
+    [[configuration.get() userContentController] addScriptMessageHandler:messageHandler.get() name:@"gum"];
+
+    auto webView = [[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500) configuration:configuration.get() processPoolConfiguration:processPoolConfig.get()];
+    webView._mediaCaptureReportingDelayForTesting = 2;
+
+    auto delegate = adoptNS([[GetUserMediaCaptureUIDelegate alloc] init]);
+    webView.UIDelegate = delegate.get();
+
+    wasPrompted = false;
+
+    [webView loadTestPageNamed:@"getUserMedia"];
+    EXPECT_TRUE(waitUntilCaptureState(webView, _WKMediaCaptureStateActiveCamera));
+
+    TestWebKitAPI::Util::run(&wasPrompted);
+    wasPrompted = false;
+
+    [webView _close];
+
+    EXPECT_EQ([webView _mediaCaptureState], _WKMediaCaptureStateNone);
 }