Title: [215983] trunk/Source/WebKit2
- Revision
- 215983
- Author
- beid...@apple.com
- Date
- 2017-04-30 00:21:23 -0700 (Sun, 30 Apr 2017)
Log Message
Regression (r215941) Unexpected logging causes perf tests to fail.
<rdar://problem/31907269> and https://bugs.webkit.org/show_bug.cgi?id=171482
Reviewed by Alexey Proskuryakov.
* Shared/mac/SandboxExtensionMac.mm:
(WebKit::resolveAndCreateReadWriteDirectoryForSandboxExtension):
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::networkingCachesDirectory):
(WebKit::WebProcessPool::webContentCachesDirectory):
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::resolveDirectoriesIfNecessary): Only resolve the cookie storage directory
if a custom one has been set.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (215982 => 215983)
--- trunk/Source/WebKit2/ChangeLog 2017-04-30 05:02:20 UTC (rev 215982)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-30 07:21:23 UTC (rev 215983)
@@ -1,3 +1,21 @@
+2017-04-30 Brady Eidson <beid...@apple.com>
+
+ Regression (r215941) Unexpected logging causes perf tests to fail.
+ <rdar://problem/31907269> and https://bugs.webkit.org/show_bug.cgi?id=171482
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Shared/mac/SandboxExtensionMac.mm:
+ (WebKit::resolveAndCreateReadWriteDirectoryForSandboxExtension):
+
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::networkingCachesDirectory):
+ (WebKit::WebProcessPool::webContentCachesDirectory):
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::resolveDirectoriesIfNecessary): Only resolve the cookie storage directory
+ if a custom one has been set.
+
2017-04-29 Youenn Fablet <you...@apple.com>
Readd assertion removed accidentally in r215955
Modified: trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm (215982 => 215983)
--- trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm 2017-04-30 05:02:20 UTC (rev 215982)
+++ trunk/Source/WebKit2/Shared/mac/SandboxExtensionMac.mm 2017-04-30 07:21:23 UTC (rev 215983)
@@ -221,7 +221,7 @@
NSString *nsPath = path;
if (![[NSFileManager defaultManager] createDirectoryAtPath:nsPath withIntermediateDirectories:YES attributes:nil error:&error]) {
- NSLog(@"could not create \"%@\", error %@", nsPath, error);
+ NSLog(@"could not create directory \"%@\" for future sandbox extension, error %@", nsPath, error);
return { };
}
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (215982 => 215983)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-04-30 05:02:20 UTC (rev 215982)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2017-04-30 07:21:23 UTC (rev 215983)
@@ -338,7 +338,7 @@
NSError *error = nil;
NSString* nsPath = path;
if (![[NSFileManager defaultManager] createDirectoryAtPath:nsPath withIntermediateDirectories:YES attributes:nil error:&error]) {
- NSLog(@"could not create \"%@\", error %@", nsPath, error);
+ NSLog(@"could not create networking caches directory \"%@\", error %@", nsPath, error);
return String();
}
@@ -357,7 +357,7 @@
NSError *error = nil;
NSString* nsPath = path;
if (![[NSFileManager defaultManager] createDirectoryAtPath:nsPath withIntermediateDirectories:YES attributes:nil error:&error]) {
- NSLog(@"could not create \"%@\", error %@", nsPath, error);
+ NSLog(@"could not create web content caches directory \"%@\", error %@", nsPath, error);
return String();
}
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (215982 => 215983)
--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-04-30 05:02:20 UTC (rev 215982)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2017-04-30 07:21:23 UTC (rev 215983)
@@ -116,9 +116,11 @@
m_resolvedConfiguration.mediaCacheDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.mediaCacheDirectory);
m_resolvedConfiguration.mediaKeysStorageDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.mediaKeysStorageDirectory);
m_resolvedConfiguration.webSQLDatabaseDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.webSQLDatabaseDirectory);
- m_resolvedConfiguration.cookieStorageDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.cookieStorageDirectory);
m_resolvedConfiguration.indexedDBDatabaseDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.indexedDBDatabaseDirectory);
+ if (!m_configuration.cookieStorageDirectory.isEmpty())
+ m_resolvedConfiguration.cookieStorageDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.cookieStorageDirectory);
+
if (!m_configuration._javascript_ConfigurationDirectory.isEmpty())
m_resolvedConfiguration._javascript_ConfigurationDirectory = resolvePathForSandboxExtension(m_configuration._javascript_ConfigurationDirectory);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
