Title: [197881] trunk/Source/WebKit2
- Revision
- 197881
- Author
- [email protected]
- Date
- 2016-03-09 13:30:45 -0800 (Wed, 09 Mar 2016)
Log Message
WebsiteDataStore::Configuration::legacyWebsiteDataStoreConfiguration() should respect the passed-in configuration
https://bugs.webkit.org/show_bug.cgi?id=155250
Reviewed by Anders Carlsson.
Note that the legacy directories are already set by default in ProcessPoolConfiguration::createWithLegacyOptions(),
which is also where the shouldHaveLegacyDataStore flag, which will cause this code path to be reached, is set.
* UIProcess/WebProcessPool.cpp:
(WebKit::legacyWebsiteDataStoreConfiguration):
Use the passed-in configuration to set the application cache, network cache, and media keys storage directories.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (197880 => 197881)
--- trunk/Source/WebKit2/ChangeLog 2016-03-09 21:30:07 UTC (rev 197880)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-09 21:30:45 UTC (rev 197881)
@@ -1,3 +1,17 @@
+2016-03-09 Conrad Shultz <[email protected]>
+
+ WebsiteDataStore::Configuration::legacyWebsiteDataStoreConfiguration() should respect the passed-in configuration
+ https://bugs.webkit.org/show_bug.cgi?id=155250
+
+ Reviewed by Anders Carlsson.
+
+ Note that the legacy directories are already set by default in ProcessPoolConfiguration::createWithLegacyOptions(),
+ which is also where the shouldHaveLegacyDataStore flag, which will cause this code path to be reached, is set.
+
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::legacyWebsiteDataStoreConfiguration):
+ Use the passed-in configuration to set the application cache, network cache, and media keys storage directories.
+
2016-03-09 Chris Dumez <[email protected]>
Speculative disk cache resource revalidations are sometimes wasted
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (197880 => 197881)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-03-09 21:30:07 UTC (rev 197880)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2016-03-09 21:30:45 UTC (rev 197881)
@@ -127,9 +127,9 @@
configuration.localStorageDirectory = processPoolConfiguration.localStorageDirectory();
configuration.webSQLDatabaseDirectory = processPoolConfiguration.webSQLDatabaseDirectory();
- configuration.applicationCacheDirectory = WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory();
- configuration.mediaKeysStorageDirectory = WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory();
- configuration.networkCacheDirectory = WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory();
+ configuration.applicationCacheDirectory = processPoolConfiguration.applicationCacheDirectory();
+ configuration.mediaKeysStorageDirectory = processPoolConfiguration.mediaKeysStorageDirectory();
+ configuration.networkCacheDirectory = processPoolConfiguration.diskCacheDirectory();
// This is needed to support legacy WK2 clients, which did not have resource load statistics.
configuration.resourceLoadStatisticsDirectory = API::WebsiteDataStore::defaultResourceLoadStatisticsDirectory();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
