Diff
Modified: trunk/Source/WebKit2/ChangeLog (182258 => 182259)
--- trunk/Source/WebKit2/ChangeLog 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-01 22:50:53 UTC (rev 182259)
@@ -1,3 +1,34 @@
+2015-04-01 Alexey Proskuryakov <a...@apple.com>
+
+ [iOS] WebContent should have access to the entirety of its caches directory
+ https://bugs.webkit.org/show_bug.cgi?id=143312
+ rdar://problem/20314916
+
+ Reviewed by Oliver Hunt.
+
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h:
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::networkingCachesDirectory):
+ (WebKit::WebProcessPool::webContentCachesDirectory):
+ (WebKit::WebProcessPool::openGLCacheDirectory): Deleted.
+ (WebKit::WebProcessPool::networkingHSTSDatabasePath): Deleted.
+ (WebKit::WebProcessPool::webContentHSTSDatabasePath): Deleted.
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::ensureNetworkProcess):
+ (WebKit::WebProcessPool::createNewWebProcess):
+ * UIProcess/WebProcessPool.h:
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
2015-04-01 Timothy Horton <timothy_hor...@apple.com>
Smart magnification gesture sometimes shoots to the middle of the page
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (182258 => 182259)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-04-01 22:50:53 UTC (rev 182259)
@@ -49,7 +49,7 @@
{
#if PLATFORM(IOS)
SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
- SandboxExtension::consumePermanently(parameters.hstsDatabasePathExtensionHandle);
+ SandboxExtension::consumePermanently(parameters.containerCachesDirectoryExtensionHandle);
SandboxExtension::consumePermanently(parameters.parentBundleDirectoryExtensionHandle);
#endif
m_diskCacheDirectory = parameters.diskCacheDirectory;
Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (182258 => 182259)
--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2015-04-01 22:50:53 UTC (rev 182259)
@@ -55,7 +55,7 @@
encoder << cookieStorageDirectory;
#if PLATFORM(IOS)
encoder << cookieStorageDirectoryExtensionHandle;
- encoder << hstsDatabasePathExtensionHandle;
+ encoder << containerCachesDirectoryExtensionHandle;
encoder << parentBundleDirectoryExtensionHandle;
#endif
encoder << shouldUseTestingNetworkSession;
@@ -105,7 +105,7 @@
#if PLATFORM(IOS)
if (!decoder.decode(result.cookieStorageDirectoryExtensionHandle))
return false;
- if (!decoder.decode(result.hstsDatabasePathExtensionHandle))
+ if (!decoder.decode(result.containerCachesDirectoryExtensionHandle))
return false;
if (!decoder.decode(result.parentBundleDirectoryExtensionHandle))
return false;
Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (182258 => 182259)
--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2015-04-01 22:50:53 UTC (rev 182259)
@@ -67,8 +67,7 @@
#if PLATFORM(IOS)
SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;
- // FIXME: Remove this once <rdar://problem/17726660> is fixed.
- SandboxExtension::Handle hstsDatabasePathExtensionHandle;
+ SandboxExtension::Handle containerCachesDirectoryExtensionHandle;
SandboxExtension::Handle parentBundleDirectoryExtensionHandle;
#endif
Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (182258 => 182259)
--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-04-01 22:50:53 UTC (rev 182259)
@@ -76,9 +76,8 @@
encoder << cookieStorageDirectory;
#if PLATFORM(IOS)
encoder << cookieStorageDirectoryExtensionHandle;
- encoder << openGLCacheDirectoryExtensionHandle;
+ encoder << containerCachesDirectoryExtensionHandle;
encoder << containerTemporaryDirectoryExtensionHandle;
- encoder << hstsDatabasePathExtensionHandle;
#endif
encoder << mediaKeyStorageDirectory;
encoder << mediaKeyStorageDirectoryExtensionHandle;
@@ -182,12 +181,10 @@
#if PLATFORM(IOS)
if (!decoder.decode(parameters.cookieStorageDirectoryExtensionHandle))
return false;
- if (!decoder.decode(parameters.openGLCacheDirectoryExtensionHandle))
+ if (!decoder.decode(parameters.containerCachesDirectoryExtensionHandle))
return false;
if (!decoder.decode(parameters.containerTemporaryDirectoryExtensionHandle))
return false;
- if (!decoder.decode(parameters.hstsDatabasePathExtensionHandle))
- return false;
#endif
if (!decoder.decode(parameters.mediaKeyStorageDirectory))
return false;
Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (182258 => 182259)
--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-04-01 22:50:53 UTC (rev 182259)
@@ -77,10 +77,8 @@
String cookieStorageDirectory;
#if PLATFORM(IOS)
SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;
- SandboxExtension::Handle openGLCacheDirectoryExtensionHandle;
+ SandboxExtension::Handle containerCachesDirectoryExtensionHandle;
SandboxExtension::Handle containerTemporaryDirectoryExtensionHandle;
- // FIXME: Remove this once <rdar://problem/17726660> is fixed.
- SandboxExtension::Handle hstsDatabasePathExtensionHandle;
#endif
SandboxExtension::Handle mediaKeyStorageDirectoryExtensionHandle;
String mediaKeyStorageDirectory;
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (182258 => 182259)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-04-01 22:50:53 UTC (rev 182259)
@@ -295,22 +295,12 @@
}
#if PLATFORM(IOS)
-String WebProcessPool::openGLCacheDirectory() const
-{
- String path = pathForProcessContainer();
- if (path.isEmpty())
- path = NSHomeDirectory();
-
- path = path + "/Library/Caches/com.apple.WebKit.WebContent/com.apple.opengl/";
- return stringByResolvingSymlinksInPath(path);
-}
-
String WebProcessPool::parentBundleDirectory() const
{
return [[[NSBundle mainBundle] bundlePath] stringByStandardizingPath];
}
-String WebProcessPool::networkingHSTSDatabasePath() const
+String WebProcessPool::networkingCachesDirectory() const
{
String path = pathForProcessContainer();
if (path.isEmpty())
@@ -326,10 +316,10 @@
return String();
}
- return path + "/HSTS.plist";
+ return path;
}
-String WebProcessPool::webContentHSTSDatabasePath() const
+String WebProcessPool::webContentCachesDirectory() const
{
String path = pathForProcessContainer();
if (path.isEmpty())
@@ -345,7 +335,7 @@
return String();
}
- return path + "/HSTS.plist";
+ return path;
}
String WebProcessPool::containerTemporaryDirectory() const
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (182258 => 182259)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-04-01 22:50:53 UTC (rev 182259)
@@ -417,9 +417,9 @@
if (!parameters.cookieStorageDirectory.isEmpty())
SandboxExtension::createHandleForReadWriteDirectory(parameters.cookieStorageDirectory, parameters.cookieStorageDirectoryExtensionHandle);
- String hstsDatabasePath = networkingHSTSDatabasePath();
- if (!hstsDatabasePath.isEmpty())
- SandboxExtension::createHandle(hstsDatabasePath, SandboxExtension::ReadWrite, parameters.hstsDatabasePathExtensionHandle);
+ String containerCachesDirectory = this->networkingCachesDirectory();
+ if (!containerCachesDirectory.isEmpty())
+ SandboxExtension::createHandleForReadWriteDirectory(containerCachesDirectory, parameters.containerCachesDirectoryExtensionHandle);
String parentBundleDirectory = this->parentBundleDirectory();
if (!parentBundleDirectory.isEmpty())
@@ -616,17 +616,13 @@
if (!parameters.cookieStorageDirectory.isEmpty())
SandboxExtension::createHandleForReadWriteDirectory(parameters.cookieStorageDirectory, parameters.cookieStorageDirectoryExtensionHandle);
- String openGLCacheDirectory = this->openGLCacheDirectory();
- if (!openGLCacheDirectory.isEmpty())
- SandboxExtension::createHandleForReadWriteDirectory(openGLCacheDirectory, parameters.openGLCacheDirectoryExtensionHandle);
+ String containerCachesDirectory = this->webContentCachesDirectory();
+ if (!containerCachesDirectory.isEmpty())
+ SandboxExtension::createHandleForReadWriteDirectory(containerCachesDirectory, parameters.containerCachesDirectoryExtensionHandle);
String containerTemporaryDirectory = this->containerTemporaryDirectory();
if (!containerTemporaryDirectory.isEmpty())
SandboxExtension::createHandleForReadWriteDirectory(containerTemporaryDirectory, parameters.containerTemporaryDirectoryExtensionHandle);
-
- String hstsDatabasePath = webContentHSTSDatabasePath();
- if (!hstsDatabasePath.isEmpty())
- SandboxExtension::createHandle(hstsDatabasePath, SandboxExtension::ReadWrite, parameters.hstsDatabasePathExtensionHandle);
#endif
parameters.mediaKeyStorageDirectory = m_mediaKeysStorageDirectory;
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (182258 => 182259)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-04-01 22:50:53 UTC (rev 182259)
@@ -402,10 +402,9 @@
String platformDefaultCookieStorageDirectory() const;
#if PLATFORM(IOS)
- String openGLCacheDirectory() const;
String parentBundleDirectory() const;
- String networkingHSTSDatabasePath() const;
- String webContentHSTSDatabasePath() const;
+ String networkingCachesDirectory() const;
+ String webContentCachesDirectory() const;
String containerTemporaryDirectory() const;
#endif
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (182258 => 182259)
--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-04-01 22:48:33 UTC (rev 182258)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2015-04-01 22:50:53 UTC (rev 182259)
@@ -162,9 +162,8 @@
SandboxExtension::consumePermanently(parameters.mediaKeyStorageDirectoryExtensionHandle);
#if PLATFORM(IOS)
SandboxExtension::consumePermanently(parameters.cookieStorageDirectoryExtensionHandle);
- SandboxExtension::consumePermanently(parameters.openGLCacheDirectoryExtensionHandle);
+ SandboxExtension::consumePermanently(parameters.containerCachesDirectoryExtensionHandle);
SandboxExtension::consumePermanently(parameters.containerTemporaryDirectoryExtensionHandle);
- SandboxExtension::consumePermanently(parameters.hstsDatabasePathExtensionHandle);
#endif
#endif
