Index: third_party/WebKit/Source/platform/heap/Heap.h |
diff --git a/third_party/WebKit/Source/platform/heap/Heap.h b/third_party/WebKit/Source/platform/heap/Heap.h |
index c494896d1b5fdc554e716e892a6a87744a4a3729..fd9efc02c1183ba3f30370720d6775e87527093d 100644 |
--- a/third_party/WebKit/Source/platform/heap/Heap.h |
+++ b/third_party/WebKit/Source/platform/heap/Heap.h |
@@ -435,6 +435,11 @@ class PLATFORM_EXPORT ThreadHeap { |
// Conservatively checks whether an address is a pointer in any of the |
// thread heaps. If so marks the object pointed to as live. |
Address checkAndMarkPointer(Visitor*, Address); |
+#if DCHECK_IS_ON() |
+ Address checkAndMarkPointer(Visitor*, |
+ Address, |
+ MarkedPointerCallbackForTesting); |
+#endif |
size_t objectPayloadSizeForTesting(); |
@@ -692,9 +697,8 @@ Address ThreadHeap::reallocate(void* previous, size_t size) { |
return address; |
} |
-template <typename Derived> |
template <typename T> |
-void VisitorHelper<Derived>::handleWeakCell(Visitor* self, void* object) { |
+void Visitor::handleWeakCell(Visitor* self, void* object) { |
T** cell = reinterpret_cast<T**>(object); |
if (*cell && !ObjectAliveTrait<T>::isHeapObjectAlive(*cell)) |
*cell = nullptr; |
@@ -702,4 +706,6 @@ void VisitorHelper<Derived>::handleWeakCell(Visitor* self, void* object) { |
} // namespace blink |
+#include "platform/heap/VisitorImpl.h" |
+ |
#endif // Heap_h |