Devirtualize Visitor and remove inline visitor specialization.

third_party/WebKit/Source/platform/heap/Heap.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 18 matching lines @@
  */
 
 #include "platform/heap/Heap.h"
 
 #include "platform/Histogram.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/heap/BlinkGCMemoryDumpProvider.h"
 #include "platform/heap/CallbackStack.h"
 #include "platform/heap/HeapCompact.h"
-#include "platform/heap/MarkingVisitor.h"
 #include "platform/heap/PageMemory.h"
 #include "platform/heap/PagePool.h"
 #include "platform/heap/SafePoint.h"
 #include "platform/heap/ThreadState.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/instrumentation/tracing/web_memory_allocator_dump.h"
 #include "platform/instrumentation/tracing/web_process_memory_dump.h"
 #include "public/platform/Platform.h"
 #include "wtf/Assertions.h"
 #include "wtf/CurrentTime.h"
@@ skipping 259 matching lines @@
 
 #if !DCHECK_IS_ON()
   m_heapDoesNotContainCache->addEntry(address);
 #else
   if (!m_heapDoesNotContainCache->lookup(address))
     m_heapDoesNotContainCache->addEntry(address);
 #endif
   return nullptr;
 }
 
+#if DCHECK_IS_ON()
+// To support unit testing of the marking of off-heap root references
+// into the heap, provide a checkAndMarkPointer() version with an
+// extra notification argument.
+Address ThreadHeap::checkAndMarkPointer(Visitor* visitor,
+                                        Address address,
+                                        MarkedPointerCallback callback) {
+  DCHECK(ThreadState::current()->isInGC());
+
+  if (BasePage* page = lookupPageForAddress(address)) {
+    DCHECK(page->contains(address));
+    DCHECK(!page->orphaned());
+    DCHECK(!m_heapDoesNotContainCache->lookup(address));
+    DCHECK(&visitor->heap() == &page->arena()->getThreadState()->heap());
+    page->checkAndMarkPointer(visitor, address, callback);
+    return address;
+  }
+  if (!m_heapDoesNotContainCache->lookup(address))
+    m_heapDoesNotContainCache->addEntry(address);
+  return nullptr;
+}
+#endif
+
 void ThreadHeap::pushTraceCallback(void* object, TraceCallback callback) {
   ASSERT(ThreadState::current()->isInGC());
 
   // Trace should never reach an orphaned page.
   ASSERT(!getOrphanedPagePool()->contains(object));
   CallbackStack::Item* slot = m_markingStack->allocateEntry();
   *slot = CallbackStack::Item(object, callback);
 }
 
 bool ThreadHeap::popAndInvokeTraceCallback(Visitor* visitor) {
@@ skipping 325 matching lines @@
   ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize());
 
   m_stats.reset();
   for (ThreadState* state : m_threads)
     state->resetHeapCounters();
 }
 
 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr;
 
 }  // namespace blink