Changeset 281007 in webkit

Timestamp:

Aug 12, 2021, 8:58:52 PM (5 years ago)

Author:

Peng Liu

Message:

REGRESSION (r280951): [ Big Sur ] TestWebKitAPI.AudioRoutingArbitration.Close is failing
​https://bugs.webkit.org/show_bug.cgi?id=229040

Reviewed by Eric Carlson.

Function AudioSessionRoutingArbitratorProxy::processDidTerminate() should
be called only in the case that the corresponding WebContent process exits,
whereas GPUProcessConnection::didClose() (in WebContent process) deals with
the case that the GPU process crashes.

No new tests. Fix an API test failure.

• UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm:

(WebKit::AudioSessionRoutingArbitratorProxy::processDidTerminate):

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::gpuProcessExited):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-08-12  Peng Liu  <peng.liu6@apple.com>
+
+        REGRESSION (r280951): [ Big Sur ] TestWebKitAPI.AudioRoutingArbitration.Close is failing
+        https://bugs.webkit.org/show_bug.cgi?id=229040
+
+        Reviewed by Eric Carlson.
+
+        Function `AudioSessionRoutingArbitratorProxy::processDidTerminate()` should
+        be called only in the case that the corresponding WebContent process exits,
+        whereas `GPUProcessConnection::didClose()` (in WebContent process) deals with
+        the case that the GPU process crashes.
+
+        No new tests. Fix an API test failure.
+
+        * UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm:
+        (WebKit::AudioSessionRoutingArbitratorProxy::processDidTerminate):
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::gpuProcessExited):
+
 2021-08-12  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm

@@ -53 +53 @@
 void AudioSessionRoutingArbitratorProxy::processDidTerminate()
 {
+    if (SharedRoutingArbitrator::sharedInstance().isInRoutingArbitrationForToken(m_token))
+        endRoutingArbitration();
 }
 

trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

@@ -821 +821 @@
     for (auto& page : copyToVectorOf<RefPtr<WebPageProxy>>(m_pageMap.values()))
         page->gpuProcessExited(reason);
-
-#if ENABLE(ROUTING_ARBITRATION)
-    m_routingArbitrator->processDidTerminate();
-#endif
 }
 #endif