content/common/gpu/gpu_memory_manager.cc - Issue 1726343003: Revert of Mustash: move content::GPUVideoMemoryUsageStats to gpu::VideoMemoryUsageStats

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/common/gpu/gpu_memory_manager.cc

Issue 1726343003: Revert of Mustash: move content::GPUVideoMemoryUsageStats to gpu::VideoMemoryUsageStats (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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: content/common/gpu/gpu_memory_manager.cc

diff --git a/content/common/gpu/gpu_memory_manager.cc b/content/common/gpu/gpu_memory_manager.cc

index 85aa15f92f9aec7c339ff4c2b5424bdf386feff1..10f769c134b87f41ed75a19f0450a5de5fc78e14 100644

--- a/content/common/gpu/gpu_memory_manager.cc

+++ b/content/common/gpu/gpu_memory_manager.cc

@@ -18,7 +18,6 @@

#include "content/common/gpu/gpu_messages.h"

#include "gpu/command_buffer/common/gpu_memory_allocation.h"

#include "gpu/command_buffer/service/gpu_switches.h"

-#include "gpu/ipc/common/memory_stats.h"

using gpu::MemoryAllocation;

@@ -92,7 +91,7 @@

}

void GpuMemoryManager::GetVideoMemoryUsageStats(

- gpu::VideoMemoryUsageStats* video_memory_usage_stats) const {

+ GPUVideoMemoryUsageStats* video_memory_usage_stats) const {

// For each context group, assign its memory usage to its PID

video_memory_usage_stats->process_map.clear();

for (TrackingGroupMap::const_iterator i =

« no previous file with comments | « content/common/gpu/gpu_memory_manager.h ('k') | content/common/gpu/gpu_messages.h » ('j') | no next file with comments »