content/browser/gpu/gpu_data_manager_impl_private.cc - Issue 1708783002: 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/browser/gpu/gpu_data_manager_impl_private.cc

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

Patch Set: rebase 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

« chrome/chrome_browser.gypi ('K') | « content/browser/gpu/gpu_data_manager_impl_private.h ('k') | content/browser/gpu/gpu_data_manager_impl_private_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/gpu/gpu_data_manager_impl_private.cc

diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc

index 6b57bcf41508598a03998e00072e6b3d2ceebfc6..3f655bb74b76f86017283b4be2daa8378e831097 100644

--- a/content/browser/gpu/gpu_data_manager_impl_private.cc

+++ b/content/browser/gpu/gpu_data_manager_impl_private.cc

@@ -32,6 +32,7 @@

#include "gpu/config/gpu_info_collector.h"

#include "gpu/config/gpu_switches.h"

#include "gpu/config/gpu_util.h"

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

#include "ui/base/ui_base_switches.h"

#include "ui/gl/gl_implementation.h"

#include "ui/gl/gl_switches.h"

@@ -644,7 +645,7 @@ void GpuDataManagerImplPrivate::UpdateGpuInfo(const gpu::GPUInfo& gpu_info) {

}

void GpuDataManagerImplPrivate::UpdateVideoMemoryUsageStats(

- const GPUVideoMemoryUsageStats& video_memory_usage_stats) {

+ const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {

GpuDataManagerImpl::UnlockedSession session(owner_);

observer_list_->Notify(FROM_HERE,

&GpuDataManagerObserver::OnVideoMemoryUsageStatsUpdate,