Title: [228168] branches/safari-605-branch/Source/WebKit
- Revision
- 228168
- Author
- jmarc...@apple.com
- Date
- 2018-02-06 07:16:39 -0800 (Tue, 06 Feb 2018)
Log Message
Cherry-pick r228137. rdar://problem/37264553
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (228167 => 228168)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-02-06 15:16:37 UTC (rev 228167)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-02-06 15:16:39 UTC (rev 228168)
@@ -1,5 +1,19 @@
2018-02-06 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r228137. rdar://problem/37264553
+
+ 2018-02-05 Youenn Fablet <you...@apple.com>
+
+ WebsiteDataStore::resolveDirectoriesIfNecessary() should not overwrite its resolved serviceWorkerRegistrationDirectory if already set
+ https://bugs.webkit.org/show_bug.cgi?id=182514
+
+ Reviewed by Chris Dumez.
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::resolveDirectoriesIfNecessary):
+
+2018-02-06 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r228125. rdar://problem/37264500
2018-02-05 Ryosuke Niwa <rn...@webkit.org>
Modified: branches/safari-605-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp (228167 => 228168)
--- branches/safari-605-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2018-02-06 15:16:37 UTC (rev 228167)
+++ branches/safari-605-branch/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp 2018-02-06 15:16:39 UTC (rev 228168)
@@ -151,7 +151,7 @@
m_resolvedConfiguration.webSQLDatabaseDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.webSQLDatabaseDirectory);
if (!m_configuration.indexedDBDatabaseDirectory.isEmpty())
m_resolvedConfiguration.indexedDBDatabaseDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.indexedDBDatabaseDirectory);
- if (!m_configuration.serviceWorkerRegistrationDirectory.isEmpty())
+ if (!m_configuration.serviceWorkerRegistrationDirectory.isEmpty() && m_resolvedConfiguration.serviceWorkerRegistrationDirectory.isEmpty())
m_resolvedConfiguration.serviceWorkerRegistrationDirectory = resolveAndCreateReadWriteDirectoryForSandboxExtension(m_configuration.serviceWorkerRegistrationDirectory);
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
