Title: [275681] branches/safari-612.1.10-branch/Source/WebKit
- Revision
- 275681
- Author
- repst...@apple.com
- Date
- 2021-04-08 14:52:38 -0700 (Thu, 08 Apr 2021)
Log Message
Cherry-pick r275669. rdar://problem/76422912
[Cocoa] Temporarily retain some media services when GPU Process active
https://bugs.webkit.org/show_bug.cgi?id=224328
<rdar://problem/76370805>
Reviewed by Eric Carlson.
Testing of the GPU Process show that access to the CoreMedia routing service is still needed under
some use cases. To prevent user-facing impact, we will allow these connections while the underlying
issues are resolved.
* UIProcess/WebPageProxy.cpp:
(WebKit::temporaryMachServices): Added.
(WebKit::WebPageProxy::creationParameters): Extend access to the set of temporaryMachServices when
the GPU Process is enabled.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275669 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-612.1.10-branch/Source/WebKit/ChangeLog (275680 => 275681)
--- branches/safari-612.1.10-branch/Source/WebKit/ChangeLog 2021-04-08 21:45:35 UTC (rev 275680)
+++ branches/safari-612.1.10-branch/Source/WebKit/ChangeLog 2021-04-08 21:52:38 UTC (rev 275681)
@@ -1,3 +1,42 @@
+2021-04-08 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r275669. rdar://problem/76422912
+
+ [Cocoa] Temporarily retain some media services when GPU Process active
+ https://bugs.webkit.org/show_bug.cgi?id=224328
+ <rdar://problem/76370805>
+
+ Reviewed by Eric Carlson.
+
+ Testing of the GPU Process show that access to the CoreMedia routing service is still needed under
+ some use cases. To prevent user-facing impact, we will allow these connections while the underlying
+ issues are resolved.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::temporaryMachServices): Added.
+ (WebKit::WebPageProxy::creationParameters): Extend access to the set of temporaryMachServices when
+ the GPU Process is enabled.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275669 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-08 Brent Fulgham <bfulg...@apple.com>
+
+ [Cocoa] Temporarily retain some media services when GPU Process active
+ https://bugs.webkit.org/show_bug.cgi?id=224328
+ <rdar://problem/76370805>
+
+ Reviewed by Eric Carlson.
+
+ Testing of the GPU Process show that access to the CoreMedia routing service is still needed under
+ some use cases. To prevent user-facing impact, we will allow these connections while the underlying
+ issues are resolved.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::temporaryMachServices): Added.
+ (WebKit::WebPageProxy::creationParameters): Extend access to the set of temporaryMachServices when
+ the GPU Process is enabled.
+
2021-04-06 Ruben Turcios <rubent...@apple.com>
Cherry-pick r275539. rdar://problem/76289146
Modified: branches/safari-612.1.10-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (275680 => 275681)
--- branches/safari-612.1.10-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-04-08 21:45:35 UTC (rev 275680)
+++ branches/safari-612.1.10-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-04-08 21:52:38 UTC (rev 275681)
@@ -7729,6 +7729,14 @@
});
return services;
}
+
+static const Vector<ASCIILiteral>& temporaryMachServices()
+{
+ static const auto services = makeNeverDestroyed(Vector<ASCIILiteral> {
+ "com.apple.coremedia.routingcontext.xpc"_s // Remove after <rdar://76403302> is fixed.
+ });
+ return services;
+}
#endif
WebPageCreationParameters WebPageProxy::creationParameters(WebProcessProxy& process, DrawingAreaProxy& drawingArea, RefPtr<API::WebsitePolicies>&& websitePolicies)
@@ -7824,6 +7832,9 @@
// FIXME(207716): The following should be removed when the GPU process is complete.
parameters.mediaExtensionHandles = SandboxExtension::createHandlesForMachLookup(mediaRelatedMachServices(), WTF::nullopt);
parameters.mediaIOKitExtensionHandles = SandboxExtension::createHandlesForIOKitClassExtensions(mediaRelatedIOKitClasses(), WTF::nullopt);
+ } else {
+ // FIXME(224327): Remove this else clause once <rdar://76403302> is fixed.
+ parameters.mediaExtensionHandles = SandboxExtension::createHandlesForMachLookup(temporaryMachServices(), WTF::nullopt);
}
if (!preferences().useGPUProcessForMediaEnabled()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
