Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Unified Diff: third_party/WebKit/Source/platform/heap/Heap.cpp

Issue 1375643002: [tracing] directly use memory-infra from blink -> base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/heap/Heap.cpp
diff --git a/third_party/WebKit/Source/platform/heap/Heap.cpp b/third_party/WebKit/Source/platform/heap/Heap.cpp
index f61dc9eb9f29c4a113fb9f71116f6250b84dcedd..20f9eb4da81333364cf4090116dc281dd40f13e1 100644
--- a/third_party/WebKit/Source/platform/heap/Heap.cpp
+++ b/third_party/WebKit/Source/platform/heap/Heap.cpp
@@ -41,8 +41,6 @@
#include "platform/heap/SafePoint.h"
#include "platform/heap/ThreadState.h"
#include "public/platform/Platform.h"
-#include "public/platform/WebMemoryAllocatorDump.h"
-#include "public/platform/WebProcessMemoryDump.h"
#include "wtf/Assertions.h"
#include "wtf/DataLog.h"
#include "wtf/LeakAnnotations.h"
@@ -175,13 +173,13 @@ void Heap::init()
GCInfoTable::init();
if (Platform::current() && Platform::current()->currentThread())
- Platform::current()->registerMemoryDumpProvider(BlinkGCMemoryDumpProvider::instance());
+ base::trace_event::MemoryDumpProvider::RegisterOnCurrentThread(BlinkGCMemoryDumpProvider::instance());
}
void Heap::shutdown()
{
if (Platform::current() && Platform::current()->currentThread())
- Platform::current()->unregisterMemoryDumpProvider(BlinkGCMemoryDumpProvider::instance());
+ base::trace_event::MemoryDumpProvider::Unregister(BlinkGCMemoryDumpProvider::instance());
s_shutdownCalled = true;
ThreadState::shutdownHeapIfNecessary();
}

Powered by Google App Engine
This is Rietveld 408576698