Title: [248206] releases/WebKitGTK/webkit-2.24/Source/WebKit
- Revision
- 248206
- Author
- [email protected]
- Date
- 2019-08-03 20:22:09 -0700 (Sat, 03 Aug 2019)
Log Message
Merge r243203 - 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=):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (248205 => 248206)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-08-04 03:22:05 UTC (rev 248205)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-08-04 03:22:09 UTC (rev 248206)
@@ -1,3 +1,15 @@
+2019-03-20 Chris Dumez <[email protected]>
+
+ 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-19 Michael Catanzaro <[email protected]>
Build cleanly with GCC 9
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CallbackID.h (248205 => 248206)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CallbackID.h 2019-08-04 03:22:05 UTC (rev 248205)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CallbackID.h 2019-08-04 03:22:09 UTC (rev 248206)
@@ -49,10 +49,7 @@
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;
}
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/OptionalCallbackID.h (248205 => 248206)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/OptionalCallbackID.h 2019-08-04 03:22:05 UTC (rev 248205)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/OptionalCallbackID.h 2019-08-04 03:22:09 UTC (rev 248206)
@@ -48,10 +48,7 @@
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;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
