Title: [281007] trunk/Source/WebKit
- Revision
- 281007
- Author
- [email protected]
- Date
- 2021-08-12 20:58:52 -0700 (Thu, 12 Aug 2021)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (281006 => 281007)
--- trunk/Source/WebKit/ChangeLog 2021-08-13 03:34:00 UTC (rev 281006)
+++ trunk/Source/WebKit/ChangeLog 2021-08-13 03:58:52 UTC (rev 281007)
@@ -1,3 +1,22 @@
+2021-08-12 Peng Liu <[email protected]>
+
+ 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 <[email protected]>
[ iOS Debug] 3 editing/pasteboard/smart-paste-paragraph tests are flaky failing
Modified: trunk/Source/WebKit/UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm (281006 => 281007)
--- trunk/Source/WebKit/UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm 2021-08-13 03:34:00 UTC (rev 281006)
+++ trunk/Source/WebKit/UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm 2021-08-13 03:58:52 UTC (rev 281007)
@@ -52,6 +52,8 @@
void AudioSessionRoutingArbitratorProxy::processDidTerminate()
{
+ if (SharedRoutingArbitrator::sharedInstance().isInRoutingArbitrationForToken(m_token))
+ endRoutingArbitration();
}
void AudioSessionRoutingArbitratorProxy::beginRoutingArbitrationWithCategory(WebCore::AudioSession::CategoryType category, ArbitrationCallback&& callback)
Modified: trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp (281006 => 281007)
--- trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2021-08-13 03:34:00 UTC (rev 281006)
+++ trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp 2021-08-13 03:58:52 UTC (rev 281007)
@@ -820,10 +820,6 @@
for (auto& page : copyToVectorOf<RefPtr<WebPageProxy>>(m_pageMap.values()))
page->gpuProcessExited(reason);
-
-#if ENABLE(ROUTING_ARBITRATION)
- m_routingArbitrator->processDidTerminate();
-#endif
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
