Diff
Modified: trunk/Source/WebKit/ChangeLog (263287 => 263288)
--- trunk/Source/WebKit/ChangeLog 2020-06-19 21:12:16 UTC (rev 263287)
+++ trunk/Source/WebKit/ChangeLog 2020-06-19 21:31:54 UTC (rev 263288)
@@ -1,3 +1,40 @@
+2020-06-19 Chris Dumez <cdu...@apple.com>
+
+ Use ASCIILiteral more for SandboxExtension functions
+ https://bugs.webkit.org/show_bug.cgi?id=213400
+
+ Reviewed by Per Arne Vollan.
+
+ Use ASCIILiteral more for SandboxExtension functions. Functions like createHandleForMachLookup() / createHandleForIOKitClassExtension()
+ don't need to take in Strings, ASCIILiteral is enough.
+
+ * Shared/Cocoa/SandboxExtensionCocoa.mm:
+ (WebKit::createHandlesForResources):
+ (WebKit::SandboxExtension::createReadOnlyHandlesForFiles):
+ (WebKit::SandboxExtension::createHandleForGenericExtension):
+ (WebKit::SandboxExtension::createHandleForMachLookup):
+ (WebKit::SandboxExtension::createHandlesForMachLookup):
+ (WebKit::SandboxExtension::createHandleForIOKitClassExtension):
+ (WebKit::SandboxExtension::createHandlesForIOKitClassExtensions):
+ * Shared/SandboxExtension.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::mediaRelatedMachServices):
+ (WebKit::nonBrowserServices):
+ (WebKit::diagnosticServices):
+ (WebKit::agxCompilerClasses):
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
+ (WebKit::WebProcessProxy::enableRemoteInspectorIfNeeded):
+ * UIProcess/GPU/GPUProcessProxy.cpp:
+ (WebKit::GPUProcessProxy::singleton):
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::UserMediaPermissionRequestManagerProxy::finishGrantingRequest):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didChooseFilesForOpenPanelWithDisplayStringAndIcon):
+ (WebKit::WebPageProxy::creationParameters):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::grantAccessToAssetServices):
+
2020-06-19 Brent Fulgham <bfulg...@apple.com>
[iOS, macOS] Allow access to the container manager to support Mail InjectedBundle
Modified: trunk/Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm (263287 => 263288)
--- trunk/Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm 2020-06-19 21:12:16 UTC (rev 263287)
+++ trunk/Source/WebKit/Shared/Cocoa/SandboxExtensionCocoa.mm 2020-06-19 21:31:54 UTC (rev 263288)
@@ -97,12 +97,12 @@
return sandbox_extension_issue_file(APP_SANDBOX_READ_WRITE, path, extensionFlags);
case SandboxExtension::Type::Mach:
if (!auditToken)
- return sandbox_extension_issue_mach("com.apple.webkit.extension.mach"_s, path, extensionFlags);
- return sandbox_extension_issue_mach_to_process("com.apple.webkit.extension.mach"_s, path, extensionFlags, *auditToken);
+ return sandbox_extension_issue_mach("com.apple.webkit.extension.mach", path, extensionFlags);
+ return sandbox_extension_issue_mach_to_process("com.apple.webkit.extension.mach", path, extensionFlags, *auditToken);
case SandboxExtension::Type::IOKit:
if (!auditToken)
- return sandbox_extension_issue_iokit_registry_entry_class("com.apple.webkit.extension.iokit"_s, path, extensionFlags);
- return sandbox_extension_issue_iokit_registry_entry_class_to_process("com.apple.webkit.extension.iokit"_s, path, extensionFlags, *auditToken);
+ return sandbox_extension_issue_iokit_registry_entry_class("com.apple.webkit.extension.iokit", path, extensionFlags);
+ return sandbox_extension_issue_iokit_registry_entry_class_to_process("com.apple.webkit.extension.iokit", path, extensionFlags, *auditToken);
case SandboxExtension::Type::Generic:
return sandbox_extension_issue_generic(path, extensionFlags);
case SandboxExtension::Type::ReadByProcess:
@@ -281,7 +281,8 @@
return createHandleWithoutResolvingPath(resolvePathForSandboxExtension(path), type, handle);
}
-static SandboxExtension::HandleArray createHandlesForResources(const Vector<String>& resources, Function<bool(const String&, SandboxExtension::Handle& handle)>&& createFunction)
+template <typename T>
+static SandboxExtension::HandleArray createHandlesForResources(const Vector<T>& resources, Function<bool(const T&, SandboxExtension::Handle& handle)>&& createFunction)
{
SandboxExtension::HandleArray handleArray;
@@ -298,18 +299,18 @@
return handleArray;
}
-SandboxExtension::HandleArray SandboxExtension::createReadOnlyHandlesForFiles(const String& logLabel, const Vector<String>& paths)
+SandboxExtension::HandleArray SandboxExtension::createReadOnlyHandlesForFiles(ASCIILiteral logLabel, const Vector<String>& paths)
{
- return createHandlesForResources(paths, [&logLabel] (const String& path, Handle& handle) {
+ return createHandlesForResources(paths, Function<bool(const String&, Handle&)>([&logLabel] (const String& path, Handle& handle) {
if (!SandboxExtension::createHandle(path, SandboxExtension::Type::ReadOnly, handle)) {
// This can legitimately fail if a directory containing the file is deleted after the file was chosen.
// We also have reports of cases where this likely fails for some unknown reason, <rdar://problem/10156710>.
- WTFLogAlways("%s: could not create a sandbox extension for '%s'\n", logLabel.utf8().data(), path.utf8().data());
+ WTFLogAlways("%s: could not create a sandbox extension for '%s'\n", logLabel.characters(), path.utf8().data());
ASSERT_NOT_REACHED();
return false;
}
return true;
- });
+ }));
}
bool SandboxExtension::createHandleForReadWriteDirectory(const String& path, SandboxExtension::Handle& handle)
@@ -350,13 +351,13 @@
return String(path.data());
}
-bool SandboxExtension::createHandleForGenericExtension(const String& extensionClass, Handle& handle)
+bool SandboxExtension::createHandleForGenericExtension(ASCIILiteral extensionClass, Handle& handle)
{
ASSERT(!handle.m_sandboxExtension);
- handle.m_sandboxExtension = SandboxExtensionImpl::create(extensionClass.utf8().data(), Type::Generic);
+ handle.m_sandboxExtension = SandboxExtensionImpl::create(extensionClass.characters(), Type::Generic);
if (!handle.m_sandboxExtension) {
- WTFLogAlways("Could not create a '%s' sandbox extension", extensionClass.utf8().data());
+ WTFLogAlways("Could not create a '%s' sandbox extension", extensionClass.characters());
return false;
}
@@ -363,13 +364,13 @@
return true;
}
-bool SandboxExtension::createHandleForMachLookup(const String& service, Optional<audit_token_t> auditToken, Handle& handle, OptionSet<Flags> flags)
+bool SandboxExtension::createHandleForMachLookup(ASCIILiteral service, Optional<audit_token_t> auditToken, Handle& handle, OptionSet<Flags> flags)
{
ASSERT(!handle.m_sandboxExtension);
- handle.m_sandboxExtension = SandboxExtensionImpl::create(service.utf8().data(), Type::Mach, auditToken, flags);
+ handle.m_sandboxExtension = SandboxExtensionImpl::create(service.characters(), Type::Mach, auditToken, flags);
if (!handle.m_sandboxExtension) {
- WTFLogAlways("Could not create a '%s' sandbox extension", service.utf8().data());
+ WTFLogAlways("Could not create a '%s' sandbox extension", service.characters());
return false;
}
@@ -376,15 +377,15 @@
return true;
}
-SandboxExtension::HandleArray SandboxExtension::createHandlesForMachLookup(const Vector<String>& services, Optional<audit_token_t> auditToken, OptionSet<Flags> flags)
+SandboxExtension::HandleArray SandboxExtension::createHandlesForMachLookup(const Vector<ASCIILiteral>& services, Optional<audit_token_t> auditToken, OptionSet<Flags> flags)
{
- return createHandlesForResources(services, [auditToken, flags] (const String& service, Handle& handle) {
+ return createHandlesForResources(services, Function<bool(const ASCIILiteral&, Handle&)>([auditToken, flags] (const ASCIILiteral& service, Handle& handle) {
if (!SandboxExtension::createHandleForMachLookup(service, auditToken, handle, flags)) {
ASSERT_NOT_REACHED();
return false;
}
return true;
- });
+ }));
}
bool SandboxExtension::createHandleForReadByAuditToken(const String& path, audit_token_t auditToken, Handle& handle)
@@ -400,13 +401,13 @@
return true;
}
-bool SandboxExtension::createHandleForIOKitClassExtension(const String& ioKitClass, Optional<audit_token_t> auditToken, Handle& handle, OptionSet<Flags> flags)
+bool SandboxExtension::createHandleForIOKitClassExtension(ASCIILiteral ioKitClass, Optional<audit_token_t> auditToken, Handle& handle, OptionSet<Flags> flags)
{
ASSERT(!handle.m_sandboxExtension);
- handle.m_sandboxExtension = SandboxExtensionImpl::create(ioKitClass.utf8().data(), Type::IOKit, auditToken);
+ handle.m_sandboxExtension = SandboxExtensionImpl::create(ioKitClass.characters(), Type::IOKit, auditToken);
if (!handle.m_sandboxExtension) {
- LOG_ERROR("Could not create a sandbox extension for '%s'", ioKitClass.utf8().data());
+ LOG_ERROR("Could not create a sandbox extension for '%s'", ioKitClass.characters());
return false;
}
@@ -413,15 +414,15 @@
return true;
}
-SandboxExtension::HandleArray SandboxExtension::createHandlesForIOKitClassExtensions(const Vector<String>& iokitClasses, Optional<audit_token_t> auditToken, OptionSet<Flags> flags)
+SandboxExtension::HandleArray SandboxExtension::createHandlesForIOKitClassExtensions(const Vector<ASCIILiteral>& iokitClasses, Optional<audit_token_t> auditToken, OptionSet<Flags> flags)
{
- return createHandlesForResources(iokitClasses, [auditToken, flags] (const String& iokitClass, Handle& handle) {
+ return createHandlesForResources(iokitClasses, Function<bool(const ASCIILiteral&, Handle&)>([auditToken, flags] (const ASCIILiteral& iokitClass, Handle& handle) {
if (!SandboxExtension::createHandleForIOKitClassExtension(iokitClass, auditToken, handle, flags)) {
ASSERT_NOT_REACHED();
return false;
}
return true;
- });
+ }));
}
SandboxExtension::SandboxExtension(const Handle& handle)
Modified: trunk/Source/WebKit/Shared/SandboxExtension.h (263287 => 263288)
--- trunk/Source/WebKit/Shared/SandboxExtension.h 2020-06-19 21:12:16 UTC (rev 263287)
+++ trunk/Source/WebKit/Shared/SandboxExtension.h 2020-06-19 21:31:54 UTC (rev 263288)
@@ -111,17 +111,17 @@
static RefPtr<SandboxExtension> create(Handle&&);
static bool createHandle(const String& path, Type, Handle&);
- static SandboxExtension::HandleArray createReadOnlyHandlesForFiles(const String& logLabel, const Vector<String>& paths);
+ static SandboxExtension::HandleArray createReadOnlyHandlesForFiles(ASCIILiteral logLabel, const Vector<String>& paths);
static bool createHandleWithoutResolvingPath(const String& path, Type, Handle&);
static bool createHandleForReadWriteDirectory(const String& path, Handle&); // Will attempt to create the directory.
static String createHandleForTemporaryFile(const String& prefix, Type, Handle&);
- static bool createHandleForGenericExtension(const String& extensionClass, Handle&);
+ static bool createHandleForGenericExtension(ASCIILiteral extensionClass, Handle&);
#if HAVE(AUDIT_TOKEN)
- static bool createHandleForMachLookup(const String& service, Optional<audit_token_t>, Handle&, OptionSet<Flags> = Flags::Default);
- static HandleArray createHandlesForMachLookup(const Vector<String>& services, Optional<audit_token_t>, OptionSet<Flags> = Flags::Default);
+ static bool createHandleForMachLookup(ASCIILiteral service, Optional<audit_token_t>, Handle&, OptionSet<Flags> = Flags::Default);
+ static HandleArray createHandlesForMachLookup(const Vector<ASCIILiteral>& services, Optional<audit_token_t>, OptionSet<Flags> = Flags::Default);
static bool createHandleForReadByAuditToken(const String& path, audit_token_t, Handle&);
- static bool createHandleForIOKitClassExtension(const String& iokitClass, Optional<audit_token_t>, Handle&, OptionSet<Flags> = Flags::Default);
- static HandleArray createHandlesForIOKitClassExtensions(const Vector<String>& iokitClasses, Optional<audit_token_t>, OptionSet<Flags> = Flags::Default);
+ static bool createHandleForIOKitClassExtension(ASCIILiteral iokitClass, Optional<audit_token_t>, Handle&, OptionSet<Flags> = Flags::Default);
+ static HandleArray createHandlesForIOKitClassExtensions(const Vector<ASCIILiteral>& iokitClasses, Optional<audit_token_t>, OptionSet<Flags> = Flags::Default);
#endif
~SandboxExtension();
@@ -160,11 +160,11 @@
inline auto SandboxExtension::HandleArray::decode(IPC::Decoder&) -> Optional<HandleArray> { return {{ }}; }
inline RefPtr<SandboxExtension> SandboxExtension::create(Handle&&) { return nullptr; }
inline bool SandboxExtension::createHandle(const String&, Type, Handle&) { return true; }
-inline SandboxExtension::HandleArray SandboxExtension::createReadOnlyHandlesForFiles(const String&, const Vector<String>&) { return { }; }
+inline SandboxExtension::HandleArray SandboxExtension::createReadOnlyHandlesForFiles(ASCIILiteral, const Vector<String>&) { return { }; }
inline bool SandboxExtension::createHandleWithoutResolvingPath(const String&, Type, Handle&) { return true; }
inline bool SandboxExtension::createHandleForReadWriteDirectory(const String&, Handle&) { return true; }
inline String SandboxExtension::createHandleForTemporaryFile(const String& /*prefix*/, Type, Handle&) {return String();}
-inline bool SandboxExtension::createHandleForGenericExtension(const String& /*extensionClass*/, Handle&) { return true; }
+inline bool SandboxExtension::createHandleForGenericExtension(ASCIILiteral /*extensionClass*/, Handle&) { return true; }
inline SandboxExtension::~SandboxExtension() { }
inline bool SandboxExtension::revoke() { return true; }
inline bool SandboxExtension::consume() { return true; }
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (263287 => 263288)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-06-19 21:12:16 UTC (rev 263287)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-06-19 21:31:54 UTC (rev 263288)
@@ -212,37 +212,37 @@
#endif
// FIXME(207716): The following should be removed when the GPU process is complete.
-static const Vector<String>& mediaRelatedMachServices()
+static const Vector<ASCIILiteral>& mediaRelatedMachServices()
{
ASSERT(isMainThread());
- static const auto services = makeNeverDestroyed(Vector<String> {
- "com.apple.audio.AudioComponentPrefs", "com.apple.audio.AudioComponentRegistrar",
- "com.apple.audio.AudioQueueServer", "com.apple.audio.toolbox.reporting.service", "com.apple.coremedia.endpoint.xpc",
- "com.apple.coremedia.routediscoverer.xpc", "com.apple.coremedia.routingcontext.xpc",
- "com.apple.coremedia.volumecontroller.xpc", "com.apple.accessibility.mediaaccessibilityd",
- "com.apple.mediaremoted.xpc",
+ static const auto services = makeNeverDestroyed(Vector<ASCIILiteral> {
+ "com.apple.audio.AudioComponentPrefs"_s, "com.apple.audio.AudioComponentRegistrar"_s,
+ "com.apple.audio.AudioQueueServer"_s, "com.apple.audio.toolbox.reporting.service"_s, "com.apple.coremedia.endpoint.xpc"_s,
+ "com.apple.coremedia.routediscoverer.xpc"_s, "com.apple.coremedia.routingcontext.xpc"_s,
+ "com.apple.coremedia.volumecontroller.xpc"_s, "com.apple.accessibility.mediaaccessibilityd"_s,
+ "com.apple.mediaremoted.xpc"_s,
#if PLATFORM(IOS_FAMILY)
- "com.apple.audio.AudioSession", "com.apple.MediaPlayer.RemotePlayerService",
- "com.apple.coremedia.admin",
- "com.apple.coremedia.asset.xpc", "com.apple.coremedia.assetimagegenerator.xpc",
- "com.apple.coremedia.audiodeviceclock.xpc", "com.apple.coremedia.audioprocessingtap.xpc",
- "com.apple.coremedia.capturesession", "com.apple.coremedia.capturesource",
- "com.apple.coremedia.compressionsession", "com.apple.coremedia.cpe.xpc",
- "com.apple.coremedia.cpeprotector.xpc", "com.apple.coremedia.customurlloader.xpc",
- "com.apple.coremedia.decompressionsession", "com.apple.coremedia.figcontentkeysession.xpc",
- "com.apple.coremedia.figcpecryptor", "com.apple.coremedia.formatreader.xpc",
- "com.apple.coremedia.player.xpc", "com.apple.coremedia.remaker",
- "com.apple.coremedia.remotequeue", "com.apple.coremedia.routingsessionmanager.xpc",
- "com.apple.coremedia.samplebufferaudiorenderer.xpc", "com.apple.coremedia.samplebufferrendersynchronizer.xpc",
- "com.apple.coremedia.sandboxserver.xpc", "com.apple.coremedia.sts",
- "com.apple.coremedia.systemcontroller.xpc", "com.apple.coremedia.videoqueue",
- "com.apple.coremedia.visualcontext.xpc", "com.apple.airplay.apsynccontroller.xpc",
- "com.apple.audio.AURemoteIOServer"
+ "com.apple.audio.AudioSession"_s, "com.apple.MediaPlayer.RemotePlayerService"_s,
+ "com.apple.coremedia.admin"_s,
+ "com.apple.coremedia.asset.xpc"_s, "com.apple.coremedia.assetimagegenerator.xpc"_s,
+ "com.apple.coremedia.audiodeviceclock.xpc"_s, "com.apple.coremedia.audioprocessingtap.xpc"_s,
+ "com.apple.coremedia.capturesession"_s, "com.apple.coremedia.capturesource"_s,
+ "com.apple.coremedia.compressionsession"_s, "com.apple.coremedia.cpe.xpc"_s,
+ "com.apple.coremedia.cpeprotector.xpc"_s, "com.apple.coremedia.customurlloader.xpc"_s,
+ "com.apple.coremedia.decompressionsession"_s, "com.apple.coremedia.figcontentkeysession.xpc"_s,
+ "com.apple.coremedia.figcpecryptor"_s, "com.apple.coremedia.formatreader.xpc"_s,
+ "com.apple.coremedia.player.xpc"_s, "com.apple.coremedia.remaker"_s,
+ "com.apple.coremedia.remotequeue"_s, "com.apple.coremedia.routingsessionmanager.xpc"_s,
+ "com.apple.coremedia.samplebufferaudiorenderer.xpc"_s, "com.apple.coremedia.samplebufferrendersynchronizer.xpc"_s,
+ "com.apple.coremedia.sandboxserver.xpc"_s, "com.apple.coremedia.sts"_s,
+ "com.apple.coremedia.systemcontroller.xpc"_s, "com.apple.coremedia.videoqueue"_s,
+ "com.apple.coremedia.visualcontext.xpc"_s, "com.apple.airplay.apsynccontroller.xpc"_s,
+ "com.apple.audio.AURemoteIOServer"_s
#endif
#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
- "com.apple.coremedia.endpointstream.xpc", "com.apple.coremedia.endpointplaybacksession.xpc",
- "com.apple.coremedia.endpointremotecontrolsession.xpc", "com.apple.coremedia.videodecoder",
- "com.apple.coremedia.videoencoder", "com.apple.BluetoothServices"
+ "com.apple.coremedia.endpointstream.xpc"_s, "com.apple.coremedia.endpointplaybacksession.xpc"_s,
+ "com.apple.coremedia.endpointremotecontrolsession.xpc"_s, "com.apple.coremedia.videodecoder"_s,
+ "com.apple.coremedia.videoencoder"_s, "com.apple.BluetoothServices"_s
#endif
});
return services;
@@ -249,43 +249,43 @@
}
#if PLATFORM(IOS_FAMILY)
-static const Vector<String>& nonBrowserServices()
+static const Vector<ASCIILiteral>& nonBrowserServices()
{
ASSERT(isMainThread());
- static const auto services = makeNeverDestroyed(Vector<String> {
- "com.apple.lsd.open",
- "com.apple.mobileassetd",
- "com.apple.iconservices",
- "com.apple.PowerManagement.control",
- "com.apple.frontboard.systemappservices"
+ static const auto services = makeNeverDestroyed(Vector<ASCIILiteral> {
+ "com.apple.lsd.open"_s,
+ "com.apple.mobileassetd"_s,
+ "com.apple.iconservices"_s,
+ "com.apple.PowerManagement.control"_s,
+ "com.apple.frontboard.systemappservices"_s
});
return services;
}
-static const Vector<String>& diagnosticServices()
+static const Vector<ASCIILiteral>& diagnosticServices()
{
ASSERT(isMainThread());
- static const auto services = makeNeverDestroyed(Vector<String> {
- "com.apple.diagnosticd",
- "com.apple.osanalytics.osanalyticshelper"
+ static const auto services = makeNeverDestroyed(Vector<ASCIILiteral> {
+ "com.apple.diagnosticd"_s,
+ "com.apple.osanalytics.osanalyticshelper"_s
});
return services;
}
-static const Vector<String>& agxCompilerClasses()
+static const Vector<ASCIILiteral>& agxCompilerClasses()
{
ASSERT(isMainThread());
- static const auto iokitClasses = makeNeverDestroyed(Vector<String> {
- "AGXCommandQueue",
- "AGXDevice",
- "AGXSharedUserClient",
- "IOAccelContext",
- "IOAccelContext2",
- "IOAccelDevice",
- "IOAccelDevice2",
- "IOAccelSharedUserClient",
- "IOAccelSharedUserClient2"
- "IOAccelSubmitter2",
+ static const auto iokitClasses = makeNeverDestroyed(Vector<ASCIILiteral> {
+ "AGXCommandQueue"_s,
+ "AGXDevice"_s,
+ "AGXSharedUserClient"_s,
+ "IOAccelContext"_s,
+ "IOAccelContext2"_s,
+ "IOAccelDevice"_s,
+ "IOAccelDevice2"_s,
+ "IOAccelSharedUserClient"_s,
+ "IOAccelSharedUserClient2"_s,
+ "IOAccelSubmitter2"_s,
});
return iokitClasses;
}
@@ -387,7 +387,7 @@
// FIXME: Remove this and related parameter when <rdar://problem/29448368> is fixed.
if (isSafari && mediaDevicesEnabled && !m_defaultPageGroup->preferences().captureAudioInUIProcessEnabled() && !m_defaultPageGroup->preferences().captureAudioInGPUProcessEnabled())
- SandboxExtension::createHandleForGenericExtension("com.apple.webkit.microphone", parameters.audioCaptureExtensionHandle);
+ SandboxExtension::createHandleForGenericExtension("com.apple.webkit.microphone"_s, parameters.audioCaptureExtensionHandle);
#endif
#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
@@ -403,7 +403,7 @@
#if PLATFORM(IOS)
if (WebCore::deviceHasAGXCompilerService()) {
SandboxExtension::Handle compilerServiceExtensionHandle;
- SandboxExtension::createHandleForMachLookup("com.apple.AGXCompilerService", WTF::nullopt, compilerServiceExtensionHandle);
+ SandboxExtension::createHandleForMachLookup("com.apple.AGXCompilerService"_s, WTF::nullopt, compilerServiceExtensionHandle);
parameters.compilerServiceExtensionHandle = WTFMove(compilerServiceExtensionHandle);
}
#endif
@@ -422,13 +422,13 @@
#if PLATFORM(COCOA)
if ([getNEFilterSourceClass() filterRequired]) {
SandboxExtension::Handle helperHandle;
- SandboxExtension::createHandleForMachLookup("com.apple.nehelper", WTF::nullopt, helperHandle);
+ SandboxExtension::createHandleForMachLookup("com.apple.nehelper"_s, WTF::nullopt, helperHandle);
parameters.neHelperExtensionHandle = WTFMove(helperHandle);
SandboxExtension::Handle managerHandle;
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
- SandboxExtension::createHandleForMachLookup("com.apple.nesessionmanager", WTF::nullopt, managerHandle);
+ SandboxExtension::createHandleForMachLookup("com.apple.nesessionmanager"_s, WTF::nullopt, managerHandle);
#else
- SandboxExtension::createHandleForMachLookup("com.apple.nesessionmanager.content-filter", WTF::nullopt, managerHandle);
+ SandboxExtension::createHandleForMachLookup("com.apple.nesessionmanager.content-filter"_s, WTF::nullopt, managerHandle);
#endif
parameters.neSessionManagerExtensionHandle = WTFMove(managerHandle);
}
@@ -435,7 +435,7 @@
parameters.systemHasBattery = systemHasBattery();
SandboxExtension::Handle mapDBHandle;
- if (SandboxExtension::createHandleForMachLookup("com.apple.lsd.mapdb", WTF::nullopt, mapDBHandle, SandboxExtension::Flags::NoReport))
+ if (SandboxExtension::createHandleForMachLookup("com.apple.lsd.mapdb"_s, WTF::nullopt, mapDBHandle, SandboxExtension::Flags::NoReport))
parameters.mapDBExtensionHandle = WTFMove(mapDBHandle);
#endif
@@ -442,11 +442,11 @@
#if PLATFORM(IOS)
if ([getWebFilterEvaluatorClass() isManagedSession]) {
SandboxExtension::Handle handle;
- SandboxExtension::createHandleForMachLookup("com.apple.uikit.viewservice.com.apple.WebContentFilter.remoteUI", WTF::nullopt, handle);
+ SandboxExtension::createHandleForMachLookup("com.apple.uikit.viewservice.com.apple.WebContentFilter.remoteUI"_s, WTF::nullopt, handle);
parameters.contentFilterExtensionHandle = WTFMove(handle);
SandboxExtension::Handle frontboardServiceExtensionHandle;
- if (SandboxExtension::createHandleForMachLookup("com.apple.frontboard.systemappservices", WTF::nullopt, frontboardServiceExtensionHandle))
+ if (SandboxExtension::createHandleForMachLookup("com.apple.frontboard.systemappservices"_s, WTF::nullopt, frontboardServiceExtensionHandle))
parameters.frontboardServiceExtensionHandle = WTFMove(frontboardServiceExtensionHandle);
}
#endif
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm (263287 => 263288)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2020-06-19 21:12:16 UTC (rev 263287)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2020-06-19 21:31:54 UTC (rev 263288)
@@ -202,7 +202,7 @@
return;
SandboxExtension::Handle handle;
auto auditToken = connection() ? connection()->getAuditToken() : WTF::nullopt;
- if (SandboxExtension::createHandleForMachLookup("com.apple.webinspector", auditToken, handle))
+ if (SandboxExtension::createHandleForMachLookup("com.apple.webinspector"_s, auditToken, handle))
send(Messages::WebProcess::EnableRemoteWebInspector(handle), 0);
}
#endif
Modified: trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp (263287 => 263288)
--- trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp 2020-06-19 21:12:16 UTC (rev 263287)
+++ trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp 2020-06-19 21:31:54 UTC (rev 263288)
@@ -102,12 +102,12 @@
bool needsCameraSandboxExtension = shouldCreateCameraSandboxExtension();
bool needsMicrophoneSandboxExtension = shouldCreateMicrophoneSandboxExtension();
if (needsCameraSandboxExtension)
- SandboxExtension::createHandleForGenericExtension("com.apple.webkit.camera", parameters.cameraSandboxExtensionHandle);
+ SandboxExtension::createHandleForGenericExtension("com.apple.webkit.camera"_s, parameters.cameraSandboxExtensionHandle);
if (needsMicrophoneSandboxExtension)
- SandboxExtension::createHandleForGenericExtension("com.apple.webkit.microphone", parameters.microphoneSandboxExtensionHandle);
+ SandboxExtension::createHandleForGenericExtension("com.apple.webkit.microphone"_s, parameters.microphoneSandboxExtensionHandle);
#if PLATFORM(IOS)
if (needsCameraSandboxExtension || needsMicrophoneSandboxExtension)
- SandboxExtension::createHandleForMachLookup("com.apple.tccd", WTF::nullopt, parameters.tccSandboxExtensionHandle);
+ SandboxExtension::createHandleForMachLookup("com.apple.tccd"_s, WTF::nullopt, parameters.tccSandboxExtensionHandle);
#endif
#endif
parameters.parentPID = getCurrentProcessID();
Modified: trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (263287 => 263288)
--- trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2020-06-19 21:12:16 UTC (rev 263287)
+++ trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2020-06-19 21:31:54 UTC (rev 263288)
@@ -255,7 +255,7 @@
SandboxExtension::Handle handle;
#if PLATFORM(COCOA)
if (!m_hasCreatedSandboxExtensionForTCCD) {
- SandboxExtension::createHandleForMachLookup("com.apple.tccd", m_page.process().connection()->getAuditToken(), handle);
+ SandboxExtension::createHandleForMachLookup("com.apple.tccd"_s, m_page.process().connection()->getAuditToken(), handle);
m_hasCreatedSandboxExtensionForTCCD = true;
}
#endif
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (263287 => 263288)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-06-19 21:12:16 UTC (rev 263287)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2020-06-19 21:31:54 UTC (rev 263288)
@@ -6672,9 +6672,9 @@
SandboxExtension::Handle frontboardServicesSandboxExtension, iconServicesSandboxExtension;
#if HAVE(FRONTBOARD_SYSTEM_APP_SERVICES)
- SandboxExtension::createHandleForMachLookup("com.apple.frontboard.systemappservices", WTF::nullopt, frontboardServicesSandboxExtension);
+ SandboxExtension::createHandleForMachLookup("com.apple.frontboard.systemappservices"_s, WTF::nullopt, frontboardServicesSandboxExtension);
#endif
- SandboxExtension::createHandleForMachLookup("com.apple.iconservices", WTF::nullopt, iconServicesSandboxExtension);
+ SandboxExtension::createHandleForMachLookup("com.apple.iconservices"_s, WTF::nullopt, iconServicesSandboxExtension);
send(Messages::WebPage::DidChooseFilesForOpenPanelWithDisplayStringAndIcon(fileURLs, displayString, iconData ? iconData->dataReference() : IPC::DataReference(), frontboardServicesSandboxExtension, iconServicesSandboxExtension));
@@ -7857,9 +7857,9 @@
#if ENABLE(ATTACHMENT_ELEMENT) && PLATFORM(IOS_FAMILY)
if (m_preferences->attachmentElementEnabled() && !m_process->hasIssuedAttachmentElementRelatedSandboxExtensions()) {
SandboxExtension::Handle handle;
- SandboxExtension::createHandleForMachLookup("com.apple.frontboard.systemappservices", WTF::nullopt, handle);
+ SandboxExtension::createHandleForMachLookup("com.apple.frontboard.systemappservices"_s, WTF::nullopt, handle);
parameters.frontboardExtensionHandle = WTFMove(handle);
- SandboxExtension::createHandleForMachLookup("com.apple.iconservices", WTF::nullopt, handle);
+ SandboxExtension::createHandleForMachLookup("com.apple.iconservices"_s, WTF::nullopt, handle);
parameters.iconServicesExtensionHandle = WTFMove(handle);
m_process->setHasIssuedAttachmentElementRelatedSandboxExtensions();
}
Modified: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (263287 => 263288)
--- trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-06-19 21:12:16 UTC (rev 263287)
+++ trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-06-19 21:31:54 UTC (rev 263288)
@@ -1642,8 +1642,8 @@
void WebPageProxy::grantAccessToAssetServices()
{
SandboxExtension::Handle mobileAssetHandle, mobileAssetHandleV2;
- SandboxExtension::createHandleForMachLookup("com.apple.mobileassetd", WTF::nullopt, mobileAssetHandle);
- SandboxExtension::createHandleForMachLookup("com.apple.mobileassetd.v2", WTF::nullopt, mobileAssetHandleV2);
+ SandboxExtension::createHandleForMachLookup("com.apple.mobileassetd"_s, WTF::nullopt, mobileAssetHandle);
+ SandboxExtension::createHandleForMachLookup("com.apple.mobileassetd.v2"_s, WTF::nullopt, mobileAssetHandleV2);
process().send(Messages::WebProcess::GrantAccessToAssetServices(mobileAssetHandle, mobileAssetHandleV2), 0);
}
