Changeset 265134 in webkit

Timestamp:

Jul 30, 2020 11:16:33 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

Optimize WebsiteDataStoreConfiguration::copy
​https://bugs.webkit.org/show_bug.cgi?id=215012
<rdar://problem/64263406>

Patch by Alex Christensen <​achristensen@webkit.org> on 2020-07-30
Reviewed by Brady Eidson.

The WebsiteDataStoreConfiguration constructor does some read/write heavy things.
We only want to do these things if we are not just going to overwrite the strings with strings from another WebsiteDataStoreConfiguration.
No change in behavior, just making things faster.

• UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:

(WebKit::WebsiteDataStoreConfiguration::WebsiteDataStoreConfiguration):
(WebKit::WebsiteDataStoreConfiguration::copy const):

• UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:

(WebKit::WebsiteDataStoreConfiguration::create):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp (modified) (2 diffs)
• UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-07-30  Alex Christensen  <achristensen@webkit.org>
+
+        Optimize WebsiteDataStoreConfiguration::copy
+        https://bugs.webkit.org/show_bug.cgi?id=215012
+        <rdar://problem/64263406>
+
+        Reviewed by Brady Eidson.
+
+        The WebsiteDataStoreConfiguration constructor does some read/write heavy things.
+        We only want to do these things if we are not just going to overwrite the strings with strings from another WebsiteDataStoreConfiguration.
+        No change in behavior, just making things faster.
+
+        * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp:
+        (WebKit::WebsiteDataStoreConfiguration::WebsiteDataStoreConfiguration):
+        (WebKit::WebsiteDataStoreConfiguration::copy const):
+        * UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h:
+        (WebKit::WebsiteDataStoreConfiguration::create):
+
 2020-07-30  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.cpp

@@ -31 +31 @@
 namespace WebKit {
 
-WebsiteDataStoreConfiguration::WebsiteDataStoreConfiguration(IsPersistent isPersistent)
+WebsiteDataStoreConfiguration::WebsiteDataStoreConfiguration(IsPersistent isPersistent, WillCopyPathsFromExistingConfiguration willCopyPaths)
     : m_isPersistent(isPersistent)
 {
-    if (isPersistent == IsPersistent::Yes) {
+    if (isPersistent == IsPersistent::Yes && willCopyPaths == WillCopyPathsFromExistingConfiguration::No) {
         setApplicationCacheDirectory(WebsiteDataStore::defaultApplicationCacheDirectory());
         setCacheStorageDirectory(WebsiteDataStore::defaultCacheStorageDirectory());
@@ -53 +53 @@
 Ref<WebsiteDataStoreConfiguration> WebsiteDataStoreConfiguration::copy() const
 {
-    auto copy = WebsiteDataStoreConfiguration::create(m_isPersistent);
+    auto copy = WebsiteDataStoreConfiguration::create(m_isPersistent, WillCopyPathsFromExistingConfiguration::Yes);
 
     copy->m_serviceWorkerProcessTerminationDelayEnabled = this->m_serviceWorkerProcessTerminationDelayEnabled;

trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStoreConfiguration.h

@@ -34 +34 @@
 
 enum class IsPersistent : bool { No, Yes };
+enum class WillCopyPathsFromExistingConfiguration : bool { No, Yes };
 
 class WebsiteDataStoreConfiguration : public API::ObjectImpl<API::Object::Type::WebsiteDataStoreConfiguration> {
 public:
-    static Ref<WebsiteDataStoreConfiguration> create(IsPersistent isPersistent) { return adoptRef(*new WebsiteDataStoreConfiguration(isPersistent)); }
-    WebsiteDataStoreConfiguration(IsPersistent);
+    static Ref<WebsiteDataStoreConfiguration> create(IsPersistent isPersistent, WillCopyPathsFromExistingConfiguration willCopyPaths = WillCopyPathsFromExistingConfiguration::No) { return adoptRef(*new WebsiteDataStoreConfiguration(isPersistent, willCopyPaths)); }
+    WebsiteDataStoreConfiguration(IsPersistent, WillCopyPathsFromExistingConfiguration = WillCopyPathsFromExistingConfiguration::No);
 
     Ref<WebsiteDataStoreConfiguration> copy() const;