Title: [233371] trunk/Source/WebKit
- Revision
- 233371
- Author
- cdu...@apple.com
- Date
- 2018-06-29 14:00:50 -0700 (Fri, 29 Jun 2018)
Log Message
Regression(r233359): Caused ITP tests to be flaky
https://bugs.webkit.org/show_bug.cgi?id=187189
Reviewed by Youenn Fablet.
r233359 started using m_resolvedConfiguration.resourceLoadStatisticsDirectory instead of
m_configuration.resourceLoadStatisticsDirectory for the ITP path. This is consistent
with what we do for other database paths so that things like '~' in paths get resolved.
This introduced flakiness because the resourceLoadStatisticsDirectory was never getting
resolved and m_resolvedConfiguration.resourceLoadStatisticsDirectory was not set.
Update the WebsiteDataStore so that m_resolvedConfiguration.resourceLoadStatisticsDirectory
properly gets set to the resolved version of m_configuration.resourceLoadStatisticsDirectory.
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::resolveDirectoriesIfNecessary):
(WebKit::WebsiteDataStore::enableResourceLoadStatisticsAndSetTestingCallback):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (233370 => 233371)
--- trunk/Source/WebKit/ChangeLog 2018-06-29 20:59:14 UTC (rev 233370)
+++ trunk/Source/WebKit/ChangeLog 2018-06-29 21:00:50 UTC (rev 233371)
@@ -1,3 +1,23 @@
+2018-06-29 Chris Dumez <cdu...@apple.com>
+
+ Regression(r233359): Caused ITP tests to be flaky
+ https://bugs.webkit.org/show_bug.cgi?id=187189
+
+ Reviewed by Youenn Fablet.
+
+ r233359 started using m_resolvedConfiguration.resourceLoadStatisticsDirectory instead of
+ m_configuration.resourceLoadStatisticsDirectory for the ITP path. This is consistent
+ with what we do for other database paths so that things like '~' in paths get resolved.
+
+ This introduced flakiness because the resourceLoadStatisticsDirectory was never getting
+ resolved and m_resolvedConfiguration.resourceLoadStatisticsDirectory was not set.
+ Update the WebsiteDataStore so that m_resolvedConfiguration.resourceLoadStatisticsDirectory
+ properly gets set to the resolved version of m_configuration.resourceLoadStatisticsDirectory.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::resolveDirectoriesIfNecessary):
+ (WebKit::WebsiteDataStore::enableResourceLoadStatisticsAndSetTestingCallback):
+
2018-06-29 John Wilander <wilan...@apple.com>
Resource Load Statistics: Don't create a WebResourceLoadStatisticsStore for ephemeral sessions
Modified: trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (233370 => 233371)
--- trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2018-06-29 20:59:14 UTC (rev 233370)
+++ trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2018-06-29 21:00:50 UTC (rev 233371)
@@ -162,6 +162,8 @@
m_resolvedConfiguration.webSQLDatabaseDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.webSQLDatabaseDirectory);
if (!m_configuration.indexedDBDatabaseDirectory.isEmpty())
m_resolvedConfiguration.indexedDBDatabaseDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.indexedDBDatabaseDirectory);
+ if (!m_configuration.resourceLoadStatisticsDirectory.isEmpty())
+ m_resolvedConfiguration.resourceLoadStatisticsDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.resourceLoadStatisticsDirectory);
if (!m_configuration.serviceWorkerRegistrationDirectory.isEmpty() && m_resolvedConfiguration.serviceWorkerRegistrationDirectory.isEmpty())
m_resolvedConfiguration.serviceWorkerRegistrationDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.serviceWorkerRegistrationDirectory);
if (!m_configuration._javascript_ConfigurationDirectory.isEmpty())
@@ -1478,6 +1480,7 @@
return;
}
+ resolveDirectoriesIfNecessary();
m_resourceLoadStatistics = WebResourceLoadStatisticsStore::create(*this);
m_resourceLoadStatistics->setStatisticsTestingCallback(WTFMove(callback));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
