Index: third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc |
diff --git a/third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc b/third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc |
index 0cd4b7ad473a7fa81967c747272fb3717c9649db..2d4ffebba0dcb70ad8aed6b918b8dbb59367ed42 100644 |
--- a/third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc |
+++ b/third_party/WebKit/Source/platform/web_process_memory_dump_impl.cc |
@@ -12,7 +12,7 @@ |
#include "base/trace_event/process_memory_dump.h" |
#include "base/trace_event/trace_event_argument.h" |
#include "base/trace_event/trace_event_memory_overhead.h" |
-#include "platform/web_memory_allocator_dump_impl.h" |
+#include "public/platform/WebMemoryAllocatorDump.h" |
#include "skia/ext/skia_trace_memory_dump_impl.h" |
namespace blink { |
@@ -61,14 +61,14 @@ WebProcessMemoryDumpImpl::createWebMemoryAllocatorDump( |
return nullptr; |
// Wrap it and return to blink. |
- WebMemoryAllocatorDumpImpl* web_memory_allocator_dump_impl = |
- new WebMemoryAllocatorDumpImpl(memory_allocator_dump); |
+ OwnPtr<WebMemoryAllocatorDump> web_memory_allocator_dump = |
+ adoptPtr(new WebMemoryAllocatorDump(memory_allocator_dump)); |
// memory_allocator_dumps_ will take ownership of |
// |web_memory_allocator_dumpd_impl|. |
memory_allocator_dumps_.set( |
- memory_allocator_dump, adoptPtr(web_memory_allocator_dump_impl)); |
- return web_memory_allocator_dump_impl; |
+ memory_allocator_dump, web_memory_allocator_dump.release()); |
+ return memory_allocator_dumps_.get(memory_allocator_dump); |
haraken
2016/02/27 16:15:50
It would be inefficient to call get() here. What B
|
} |
blink::WebMemoryAllocatorDump* WebProcessMemoryDumpImpl::getMemoryAllocatorDump( |