Unreviewed, drop invalid assertions landed in r243163.
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Mar 2019 16:10:17 +0000 (16:10 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Mar 2019 16:10:17 +0000 (16:10 +0000)
Those assertions were causing some API tests to crash.
Also include some post-review suggestions from Darin.

* Shared/CallbackID.h:
(WebKit::CallbackID::operator=):
* Shared/OptionalCallbackID.h:
(WebKit::OptionalCallbackID::operator=):

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

Source/WebKit/ChangeLog
Source/WebKit/Shared/CallbackID.h
Source/WebKit/Shared/OptionalCallbackID.h

index e3e0444..7e83fb5 100644 (file)
@@ -1,5 +1,17 @@
 2019-03-20  Chris Dumez  <cdumez@apple.com>
 
+        Unreviewed, drop invalid assertions landed in r243163.
+
+        Those assertions were causing some API tests to crash.
+        Also include some post-review suggestions from Darin.
+
+        * Shared/CallbackID.h:
+        (WebKit::CallbackID::operator=):
+        * Shared/OptionalCallbackID.h:
+        (WebKit::OptionalCallbackID::operator=):
+
+2019-03-20  Chris Dumez  <cdumez@apple.com>
+
         Unreviewed, fix assertion failures in API tests after r243159.
 
         * UIProcess/VisitedLinkStore.cpp:
index b4a0d8e..a26feb8 100644 (file)
@@ -49,10 +49,7 @@ public:
 
     ALWAYS_INLINE CallbackID& operator=(const CallbackID& otherID)
     {
-        if (this == &otherID)
-            return *this;
         m_id = otherID.m_id;
-        ASSERT(HashTraits<uint64_t>::emptyValue() != m_id && !HashTraits<uint64_t>::isDeletedValue(m_id));
         return *this;
     }
 
index 7a5e4cb..cd34b08 100644 (file)
@@ -48,10 +48,7 @@ public:
 
     ALWAYS_INLINE OptionalCallbackID& operator=(const OptionalCallbackID& otherID)
     {
-        if (this == &otherID)
-            return *this;
         m_id = otherID.m_id;
-        ASSERT(!HashTraits<uint64_t>::isDeletedValue(m_id));
         return *this;
     }