Changeset 250321 in webkit

Timestamp:

Sep 24, 2019 4:35:15 PM (5 years ago)

Author:

achristensen@apple.com

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:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WebProcessPoolCocoa.mm (modified) (5 diffs)
• UIProcess/WebProcessPool.cpp (modified) (1 diff)
• UIProcess/WebProcessPool.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-24  Alex Christensen  <achristensen@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  <pgriffis@igalia.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

@@ -143 +143 @@
 
 #if PLATFORM(IOS_FAMILY)
-String WebProcessPool::cookieStorageDirectory() const
+String WebProcessPool::cookieStorageDirectory()
 {
     String path = pathForProcessContainer();
@@ -160 +160 @@
 
 #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
 }
@@ -317 +317 @@
 
 #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();
@@ -341 +341 @@
 }
 
-String WebProcessPool::webContentCachesDirectory() const
+String WebProcessPool::webContentCachesDirectory()
 {
     String path = pathForProcessContainer();
@@ -360 +360 @@
 }
 
-String WebProcessPool::containerTemporaryDirectory() const
+String WebProcessPool::containerTemporaryDirectory()
 {
     String path = NSTemporaryDirectory();

trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

@@ -504 +504 @@
 
 #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);

trunk/Source/WebKit/UIProcess/WebProcessPool.h

@@ -577 +577 @@
 
 #if PLATFORM(IOS_FAMILY)
-    String cookieStorageDirectory() const;
-#endif
-
-#if PLATFORM(IOS_FAMILY)
-    String parentBundleDirectory() const;
-    String networkingCachesDirectory() const;
-    String webContentCachesDirectory() const;
-    String containerTemporaryDirectory() const;
+    static String cookieStorageDirectory();
+    static String parentBundleDirectory();
+    static String networkingCachesDirectory();
+    static String webContentCachesDirectory();
+    static String containerTemporaryDirectory();
 #endif