Don't always look for a JSC configuration file after r247685
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Jul 2019 18:12:14 +0000 (18:12 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 22 Jul 2019 18:12:14 +0000 (18:12 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247689 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index 21f5a18..1df773a 100644 (file)
@@ -1,3 +1,16 @@
+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>
 
         Make some constructors explicit
index 54a4ab5..bad1478 100644 (file)
@@ -60,7 +60,6 @@ Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::createWithWebsiteDataSto
     configuration->m_mediaKeysStorageDirectory = legacyConfiguration.mediaKeysStorageDirectory();
     configuration->m_resourceLoadStatisticsDirectory = legacyConfiguration.resourceLoadStatisticsDirectory();
     configuration->m_webSQLDatabaseDirectory = legacyConfiguration.webSQLDatabaseDirectory();
-    configuration->m_javaScriptConfigurationDirectory = legacyConfiguration.javaScriptConfigurationDirectory();
 
     return configuration;
 }
@@ -76,7 +75,6 @@ ProcessPoolConfiguration::ProcessPoolConfiguration()
     , m_webSQLDatabaseDirectory(WebsiteDataStore::defaultWebSQLDatabaseDirectory())
     , m_mediaKeysStorageDirectory(WebsiteDataStore::defaultMediaKeysStorageDirectory())
     , m_resourceLoadStatisticsDirectory(WebsiteDataStore::defaultResourceLoadStatisticsDirectory())
-    , m_javaScriptConfigurationDirectory(WebsiteDataStore::defaultJavaScriptConfigurationDirectory())
 {
 }