summaryrefslogtreecommitdiffstats
path: root/chromium/third_party/WebKit/Source/platform/heap/Heap.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/WebKit/Source/platform/heap/Heap.h')
-rw-r--r--chromium/third_party/WebKit/Source/platform/heap/Heap.h13
1 files changed, 3 insertions, 10 deletions
diff --git a/chromium/third_party/WebKit/Source/platform/heap/Heap.h b/chromium/third_party/WebKit/Source/platform/heap/Heap.h
index 33753e94a52..6c1ba3a0ae7 100644
--- a/chromium/third_party/WebKit/Source/platform/heap/Heap.h
+++ b/chromium/third_party/WebKit/Source/platform/heap/Heap.h
@@ -413,15 +413,6 @@ class PLATFORM_EXPORT ThreadHeap {
// heap-page if one exists.
BasePage* LookupPageForAddress(Address);
- static const GCInfo* GcInfo(size_t gc_info_index) {
- DCHECK_GE(gc_info_index, 1u);
- DCHECK(gc_info_index < GCInfoTable::kMaxIndex);
- DCHECK(g_gc_info_table);
- const GCInfo* info = g_gc_info_table[gc_info_index];
- DCHECK(info);
- return info;
- }
-
static void ReportMemoryUsageHistogram();
static void ReportMemoryUsageForTracing();
@@ -761,7 +752,9 @@ Address ThreadHeap::Reallocate(void* previous, size_t size) {
size_t gc_info_index = GCInfoTrait<T>::Index();
// TODO(haraken): We don't support reallocate() for finalizable objects.
- DCHECK(!ThreadHeap::GcInfo(previous_header->GcInfoIndex())->HasFinalizer());
+ DCHECK(!GCInfoTable::Get()
+ .GCInfoFromIndex(previous_header->GcInfoIndex())
+ ->HasFinalizer());
DCHECK_EQ(previous_header->GcInfoIndex(), gc_info_index);
HeapAllocHooks::FreeHookIfEnabled(static_cast<Address>(previous));
Address address;