Changeset 276499 in webkit

Timestamp:

Apr 23, 2021, 8:40:24 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Improve HashTableDeletedValue of ServiceWorkerRegistrationKey
​https://bugs.webkit.org/show_bug.cgi?id=224975

Patch by Michael Catanzaro <Michael Catanzaro> on 2021-04-23
Reviewed by Chris Dumez.

We construct only the SecurityOriginData, no need to construct a full
ServiceWorkerRegistrationKey or URL. No behavior changes.

• workers/service/ServiceWorkerRegistrationKey.h:

(WTF::HashTraits<WebCore::ServiceWorkerRegistrationKey>::constructDeletedValue):
(WTF::HashTraits<WebCore::ServiceWorkerRegistrationKey>::isDeletedValue):
(WebCore::ServiceWorkerRegistrationKey::isHashTableDeletedValue const): Deleted.
(WebCore::ServiceWorkerRegistrationKey::ServiceWorkerRegistrationKey): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• workers/service/ServiceWorkerRegistrationKey.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-23  Michael Catanzaro  <mcatanzaro@gnome.org>
+
+        Improve HashTableDeletedValue of ServiceWorkerRegistrationKey
+        https://bugs.webkit.org/show_bug.cgi?id=224975
+
+        Reviewed by Chris Dumez.
+
+        We construct only the SecurityOriginData, no need to construct a full
+        ServiceWorkerRegistrationKey or URL. No behavior changes.
+
+        * workers/service/ServiceWorkerRegistrationKey.h:
+        (WTF::HashTraits<WebCore::ServiceWorkerRegistrationKey>::constructDeletedValue):
+        (WTF::HashTraits<WebCore::ServiceWorkerRegistrationKey>::isDeletedValue):
+        (WebCore::ServiceWorkerRegistrationKey::isHashTableDeletedValue const): Deleted.
+        (WebCore::ServiceWorkerRegistrationKey::ServiceWorkerRegistrationKey): Deleted.
+
 2021-04-23  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/workers/service/ServiceWorkerRegistrationKey.h

@@ -36 +36 @@
 public:
     ServiceWorkerRegistrationKey() = default;
-    explicit ServiceWorkerRegistrationKey(WTF::HashTableDeletedValueType);
     WEBCORE_EXPORT ServiceWorkerRegistrationKey(SecurityOriginData&& topOrigin, URL&& scope);
 
@@ -67 +66 @@
 #endif
 
-    bool isHashTableDeletedValue() const { return m_topOrigin.isHashTableDeletedValue(); }
+private:
+    friend struct HashTraits<ServiceWorkerRegistrationKey>;
 
-private:
     SecurityOriginData m_topOrigin;
     URL m_scope;
 };
-
-inline ServiceWorkerRegistrationKey::ServiceWorkerRegistrationKey(WTF::HashTableDeletedValueType)
-    : m_topOrigin(WTF::HashTableDeletedValue)
-{
-}
 
 template<class Encoder>
@@ -115 +109 @@
     static WebCore::ServiceWorkerRegistrationKey emptyValue() { return WebCore::ServiceWorkerRegistrationKey::emptyKey(); }
 
-    static void constructDeletedValue(WebCore::ServiceWorkerRegistrationKey& slot) { new (NotNull, &slot) WebCore::ServiceWorkerRegistrationKey(HashTableDeletedValue); }
-    static bool isDeletedValue(const WebCore::ServiceWorkerRegistrationKey& slot) { return slot.isHashTableDeletedValue(); }
+    static void constructDeletedValue(WebCore::ServiceWorkerRegistrationKey& slot) { new (NotNull, &slot.m_topOrigin) WebCore::SecurityOriginData(HashTableDeletedValue); }
+    static bool isDeletedValue(const WebCore::ServiceWorkerRegistrationKey& slot) { return slot.m_topOrigin.isHashTableDeletedValue(); }
 };