Changeset 247689 in webkit

Timestamp:

Jul 22, 2019 11:12:14 AM (5 years ago)

Author:

achristensen@apple.com

Message:

Don't always look for a JSC configuration file after r247685
​https://bugs.webkit.org/show_bug.cgi?id=199917

• UIProcess/API/APIProcessPoolConfiguration.cpp:

(API::ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration):
(API::ProcessPoolConfiguration::ProcessPoolConfiguration):
ProcessPoolConfiguration's javaScriptConfigurationDirectory wasn't used before r247685,
which made it always look for a file with 'JavaScriptCoreDebug' in its name. I had assumed
m_javaScriptConfigurationDirectory would default to a null string, but it was defaulting to
defaultJavaScriptConfigurationDirectory. Make it a null string instead.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIProcessPoolConfiguration.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-22  Alex Christensen  <achristensen@webkit.org>
+
+        Don't always look for a JSC configuration file after r247685
+        https://bugs.webkit.org/show_bug.cgi?id=199917
+
+        * UIProcess/API/APIProcessPoolConfiguration.cpp:
+        (API::ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration):
+        (API::ProcessPoolConfiguration::ProcessPoolConfiguration):
+        ProcessPoolConfiguration's javaScriptConfigurationDirectory wasn't used before r247685,
+        which made it always look for a file with 'JavaScriptCoreDebug' in its name.  I had assumed
+        m_javaScriptConfigurationDirectory would default to a null string, but it was defaulting to
+        defaultJavaScriptConfigurationDirectory.  Make it a null string instead.
+
 2019-07-22  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp

@@ -61 +61 @@
     configuration->m_resourceLoadStatisticsDirectory = legacyConfiguration.resourceLoadStatisticsDirectory();
     configuration->m_webSQLDatabaseDirectory = legacyConfiguration.webSQLDatabaseDirectory();
-    configuration->m_javaScriptConfigurationDirectory = legacyConfiguration.javaScriptConfigurationDirectory();
 
     return configuration;
@@ -77 +76 @@
     , m_mediaKeysStorageDirectory(WebsiteDataStore::defaultMediaKeysStorageDirectory())
     , m_resourceLoadStatisticsDirectory(WebsiteDataStore::defaultResourceLoadStatisticsDirectory())
-    , m_javaScriptConfigurationDirectory(WebsiteDataStore::defaultJavaScriptConfigurationDirectory())
 {
 }