Stop using CheckedRef with HistoryItem

https://bugs.webkit.org/show_bug.cgi?id=266459 Reviewed by Ryosuke Niwa. Stop using CheckedRef with HistoryItem. Use WeakRef instead to generate more actionable crashes. * Source/WebCore/history/HistoryItem.cpp: (WebCore::HistoryItem::HistoryItem): * Source/WebCore/history/HistoryItem.h: * Source/WebKitLegacy/mac/History/WebHistoryItem.mm: Canonical link: https://commits.webkit.org/272125@main
WebKit · Dec 15, 2023 · e523b9d · e523b9d
1 parent abebb37
commit e523b9d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Source/WebCore/history/HistoryItem.cpp b/Source/WebCore/history/HistoryItem.cpp
@@ -67,7 +67,7 @@ HistoryItem::~HistoryItem()
 
 HistoryItem::HistoryItem(const HistoryItem& item)
     : RefCounted<HistoryItem>()
-    , CanMakeCheckedPtr()
+    , CanMakeWeakPtr<HistoryItem>()
     , m_urlString(item.m_urlString)
     , m_originalURLString(item.m_originalURLString)
     , m_referrer(item.m_referrer)

diff --git a/Source/WebCore/history/HistoryItem.h b/Source/WebCore/history/HistoryItem.h
@@ -35,8 +35,8 @@
 #include "PolicyContainer.h"
 #include "SerializedScriptValue.h"
 #include <memory>
-#include <wtf/CheckedRef.h>
 #include <wtf/RefCounted.h>
+#include <wtf/WeakPtr.h>
 #include <wtf/text/WTFString.h>
 
 #if PLATFORM(IOS_FAMILY)
@@ -67,7 +67,7 @@ class HistoryItemClient : public RefCounted<HistoryItemClient> {
     HistoryItemClient() = default;
 };
 
-class HistoryItem : public RefCounted<HistoryItem>, public CanMakeCheckedPtr {
+class HistoryItem : public RefCounted<HistoryItem>, public CanMakeWeakPtr<HistoryItem> {
     friend class BackForwardCache;
 
 public:

diff --git a/Source/WebKitLegacy/mac/History/WebHistoryItem.mm b/Source/WebKitLegacy/mac/History/WebHistoryItem.mm
@@ -98,7 +98,7 @@ @implementation WebHistoryItemPrivate
 
 @end
 
-using HistoryItemMap = HashMap<CheckedRef<HistoryItem>, WebHistoryItem*>;
+using HistoryItemMap = HashMap<WeakRef<HistoryItem>, WebHistoryItem*>;
 
 static inline WebCoreHistoryItem* core(WebHistoryItemPrivate* itemPrivate)
 {