Title: [250321] trunk/Source/WebKit
- Revision
- 250321
- Author
- achristen...@apple.com
- Date
- 2019-09-24 16:35:15 -0700 (Tue, 24 Sep 2019)
Log Message
Make iOS WebProcessPool directory getters static
https://bugs.webkit.org/show_bug.cgi?id=202157
Reviewed by Tim Horton.
No change in behavior. This just cuts another dependency the NetworkProcessProxy has on its owning WebProcessPool.
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::cookieStorageDirectory):
(WebKit::WebProcessPool::platformResolvePathsForSandboxExtensions):
(WebKit::WebProcessPool::parentBundleDirectory):
(WebKit::WebProcessPool::networkingCachesDirectory):
(WebKit::WebProcessPool::webContentCachesDirectory):
(WebKit::WebProcessPool::containerTemporaryDirectory):
(WebKit::WebProcessPool::cookieStorageDirectory const): Deleted.
(WebKit::WebProcessPool::parentBundleDirectory const): Deleted.
(WebKit::WebProcessPool::networkingCachesDirectory const): Deleted.
(WebKit::WebProcessPool::webContentCachesDirectory const): Deleted.
(WebKit::WebProcessPool::containerTemporaryDirectory const): Deleted.
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::ensureNetworkProcess):
* UIProcess/WebProcessPool.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (250320 => 250321)
--- trunk/Source/WebKit/ChangeLog 2019-09-24 23:32:07 UTC (rev 250320)
+++ trunk/Source/WebKit/ChangeLog 2019-09-24 23:35:15 UTC (rev 250321)
@@ -1,3 +1,28 @@
+2019-09-24 Alex Christensen <achristen...@webkit.org>
+
+ Make iOS WebProcessPool directory getters static
+ https://bugs.webkit.org/show_bug.cgi?id=202157
+
+ Reviewed by Tim Horton.
+
+ No change in behavior. This just cuts another dependency the NetworkProcessProxy has on its owning WebProcessPool.
+
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::cookieStorageDirectory):
+ (WebKit::WebProcessPool::platformResolvePathsForSandboxExtensions):
+ (WebKit::WebProcessPool::parentBundleDirectory):
+ (WebKit::WebProcessPool::networkingCachesDirectory):
+ (WebKit::WebProcessPool::webContentCachesDirectory):
+ (WebKit::WebProcessPool::containerTemporaryDirectory):
+ (WebKit::WebProcessPool::cookieStorageDirectory const): Deleted.
+ (WebKit::WebProcessPool::parentBundleDirectory const): Deleted.
+ (WebKit::WebProcessPool::networkingCachesDirectory const): Deleted.
+ (WebKit::WebProcessPool::webContentCachesDirectory const): Deleted.
+ (WebKit::WebProcessPool::containerTemporaryDirectory const): Deleted.
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::ensureNetworkProcess):
+ * UIProcess/WebProcessPool.h:
+
2019-09-24 Patrick Griffis <pgrif...@igalia.com>
[GTK][WPE] Minor code cleanup in BubblewrapLauncher
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (250320 => 250321)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2019-09-24 23:32:07 UTC (rev 250320)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2019-09-24 23:35:15 UTC (rev 250321)
@@ -142,7 +142,7 @@
}
#if PLATFORM(IOS_FAMILY)
-String WebProcessPool::cookieStorageDirectory() const
+String WebProcessPool::cookieStorageDirectory()
{
String path = pathForProcessContainer();
if (path.isEmpty())
@@ -159,9 +159,9 @@
m_resolvedPaths.uiProcessBundleResourcePath = resolvePathForSandboxExtension([[NSBundle mainBundle] resourcePath]);
#if PLATFORM(IOS_FAMILY)
- m_resolvedPaths.cookieStorageDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(cookieStorageDirectory());
- m_resolvedPaths.containerCachesDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(webContentCachesDirectory());
- m_resolvedPaths.containerTemporaryDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(containerTemporaryDirectory());
+ m_resolvedPaths.cookieStorageDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(WebProcessPool::cookieStorageDirectory());
+ m_resolvedPaths.containerCachesDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(WebProcessPool::webContentCachesDirectory());
+ m_resolvedPaths.containerTemporaryDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(WebProcessPool::containerTemporaryDirectory());
#endif
}
@@ -316,12 +316,12 @@
}
#if PLATFORM(IOS_FAMILY)
-String WebProcessPool::parentBundleDirectory() const
+String WebProcessPool::parentBundleDirectory()
{
return [[[NSBundle mainBundle] bundlePath] stringByStandardizingPath];
}
-String WebProcessPool::networkingCachesDirectory() const
+String WebProcessPool::networkingCachesDirectory()
{
String path = pathForProcessContainer();
if (path.isEmpty())
@@ -340,7 +340,7 @@
return path;
}
-String WebProcessPool::webContentCachesDirectory() const
+String WebProcessPool::webContentCachesDirectory()
{
String path = pathForProcessContainer();
if (path.isEmpty())
@@ -359,7 +359,7 @@
return path;
}
-String WebProcessPool::containerTemporaryDirectory() const
+String WebProcessPool::containerTemporaryDirectory()
{
String path = NSTemporaryDirectory();
return stringByResolvingSymlinksInPath(path);
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (250320 => 250321)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-09-24 23:32:07 UTC (rev 250320)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-09-24 23:35:15 UTC (rev 250321)
@@ -503,15 +503,15 @@
#endif
#if PLATFORM(IOS_FAMILY)
- String cookieStorageDirectory = this->cookieStorageDirectory();
+ String cookieStorageDirectory = WebProcessPool::cookieStorageDirectory();
if (!cookieStorageDirectory.isEmpty())
SandboxExtension::createHandleForReadWriteDirectory(cookieStorageDirectory, parameters.cookieStorageDirectoryExtensionHandle);
- String containerCachesDirectory = this->networkingCachesDirectory();
+ String containerCachesDirectory = WebProcessPool::networkingCachesDirectory();
if (!containerCachesDirectory.isEmpty())
SandboxExtension::createHandleForReadWriteDirectory(containerCachesDirectory, parameters.containerCachesDirectoryExtensionHandle);
- String parentBundleDirectory = this->parentBundleDirectory();
+ String parentBundleDirectory = WebProcessPool::parentBundleDirectory();
if (!parentBundleDirectory.isEmpty())
SandboxExtension::createHandle(parentBundleDirectory, SandboxExtension::Type::ReadOnly, parameters.parentBundleDirectoryExtensionHandle);
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (250320 => 250321)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.h 2019-09-24 23:32:07 UTC (rev 250320)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h 2019-09-24 23:35:15 UTC (rev 250321)
@@ -576,16 +576,13 @@
bool usesSingleWebProcess() const { return m_configuration->usesSingleWebProcess(); }
#if PLATFORM(IOS_FAMILY)
- String cookieStorageDirectory() const;
+ static String cookieStorageDirectory();
+ static String parentBundleDirectory();
+ static String networkingCachesDirectory();
+ static String webContentCachesDirectory();
+ static String containerTemporaryDirectory();
#endif
-#if PLATFORM(IOS_FAMILY)
- String parentBundleDirectory() const;
- String networkingCachesDirectory() const;
- String webContentCachesDirectory() const;
- String containerTemporaryDirectory() const;
-#endif
-
#if PLATFORM(COCOA)
void registerNotificationObservers();
void unregisterNotificationObservers();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
