| Index: media/video/gpu_memory_buffer_video_frame_pool.cc
|
| diff --git a/media/video/gpu_memory_buffer_video_frame_pool.cc b/media/video/gpu_memory_buffer_video_frame_pool.cc
|
| index d75f7aaa690b4b5a2442be1d1797cb642a86eb92..c9e7922d0f28502affcaec063ae112f6bf564dc9 100644
|
| --- a/media/video/gpu_memory_buffer_video_frame_pool.cc
|
| +++ b/media/video/gpu_memory_buffer_video_frame_pool.cc
|
| @@ -19,6 +19,8 @@
|
| #include "base/containers/stack_container.h"
|
| #include "base/location.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/shared_memory.h"
|
| +#include "base/memory/shared_memory_tracker.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/trace_event/memory_dump_manager.h"
|
| #include "base/trace_event/memory_dump_provider.h"
|
| @@ -450,10 +452,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHardwareFrame(
|
| bool GpuMemoryBufferVideoFramePool::PoolImpl::OnMemoryDump(
|
| const base::trace_event::MemoryDumpArgs& args,
|
| base::trace_event::ProcessMemoryDump* pmd) {
|
| - const uint64_t tracing_process_id =
|
| - base::trace_event::MemoryDumpManager::GetInstance()
|
| - ->GetTracingProcessId();
|
| - const int kImportance = 2;
|
| + // const int kImportance = 2;
|
| for (const FrameResources* frame_resources : resources_pool_) {
|
| for (const PlaneResource& plane_resource :
|
| frame_resources->plane_resources) {
|
| @@ -472,11 +471,11 @@ bool GpuMemoryBufferVideoFramePool::PoolImpl::OnMemoryDump(
|
| dump->AddScalar("free_size",
|
| base::trace_event::MemoryAllocatorDump::kUnitsBytes,
|
| frame_resources->IsInUse() ? 0 : buffer_size_in_bytes);
|
| - base::trace_event::MemoryAllocatorDumpGuid shared_buffer_guid =
|
| - gfx::GetGpuMemoryBufferGUIDForTracing(tracing_process_id,
|
| - buffer_id);
|
| - pmd->CreateSharedGlobalAllocatorDump(shared_buffer_guid);
|
| - pmd->AddOwnershipEdge(dump->guid(), shared_buffer_guid, kImportance);
|
| + // TODO: Fix this
|
| + /*base::SharedMemory* shared_memory =
|
| + plane_resource.gpu_memory_buffer->GetHandle();
|
| + base::SharedMemoryTracker::AddOwnershipEdges(
|
| + pmd, dump, *shared_memory, buffer_size_in_bytes);*/
|
| }
|
| }
|
| }
|
|
|