Changeset 228630 in webkit

Timestamp:

Feb 19, 2018 1:39:09 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r228137 - WebsiteDataStore::resolveDirectoriesIfNecessary() should not overwrite its resolved serviceWorkerRegistrationDirectory if already set
​https://bugs.webkit.org/show_bug.cgi?id=182514

Patch by Youenn Fablet <​youenn@apple.com> on 2018-02-05
Reviewed by Chris Dumez.

• UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::resolveDirectoriesIfNecessary):

Location:

releases/WebKitGTK/webkit-2.20/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.20/Source/WebKit/ChangeLog

@@ +1 @@
+2018-02-05  Youenn Fablet  <youenn@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-05  Ryosuke Niwa  <rniwa@webkit.org>
 

releases/WebKitGTK/webkit-2.20/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -152 +152 @@
     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.javaScriptConfigurationDirectory.isEmpty())