| 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 4dbdce147a73858c80b831e19bcdacbad2de20d4..e6667c27cb9e2028b54076edf927f60e8cd4da09 100644
|
| --- a/content/browser/gpu/gpu_data_manager_impl_private.cc
|
| +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
|
| @@ -264,15 +264,22 @@ bool ShouldDisableHardwareAcceleration() {
|
| switches::kDisableGpu);
|
| }
|
|
|
| -void OnVideoMemoryUsageStats(const gpu::VideoMemoryUsageStats& stats) {
|
| - GpuDataManagerImpl::GetInstance()->UpdateVideoMemoryUsageStats(stats);
|
| -}
|
| -
|
| -void RequestVideoMemoryUsageStats(GpuProcessHost* host) {
|
| +void OnVideoMemoryUsageStats(
|
| + const base::Callback<void(const gpu::VideoMemoryUsageStats& stats)>&
|
| + callback,
|
| + const gpu::VideoMemoryUsageStats& stats) {
|
| + BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
|
| + base::Bind(callback, stats));
|
| +}
|
| +
|
| +void RequestVideoMemoryUsageStats(
|
| + const base::Callback<void(const gpu::VideoMemoryUsageStats& stats)>&
|
| + callback,
|
| + GpuProcessHost* host) {
|
| if (!host)
|
| return;
|
| host->gpu_service()->GetVideoMemoryUsageStats(
|
| - base::Bind(&OnVideoMemoryUsageStats));
|
| + base::Bind(&OnVideoMemoryUsageStats, callback));
|
| }
|
|
|
| void UpdateGpuInfoOnIO(const gpu::GPUInfo& gpu_info) {
|
| @@ -450,10 +457,12 @@ bool GpuDataManagerImplPrivate::IsCompleteGpuInfoAvailable() const {
|
| return IsEssentialGpuInfoAvailable();
|
| }
|
|
|
| -void GpuDataManagerImplPrivate::RequestVideoMemoryUsageStatsUpdate() const {
|
| +void GpuDataManagerImplPrivate::RequestVideoMemoryUsageStatsUpdate(
|
| + const base::Callback<void(const gpu::VideoMemoryUsageStats& stats)>&
|
| + callback) const {
|
| GpuProcessHost::CallOnIO(GpuProcessHost::GPU_PROCESS_KIND_SANDBOXED,
|
| false /* force_create */,
|
| - base::Bind(&RequestVideoMemoryUsageStats));
|
| + base::Bind(&RequestVideoMemoryUsageStats, callback));
|
| }
|
|
|
| bool GpuDataManagerImplPrivate::ShouldUseSwiftShader() const {
|
| @@ -713,14 +722,6 @@ void GpuDataManagerImplPrivate::UpdateGpuFeatureInfo(
|
| }
|
| }
|
|
|
| -void GpuDataManagerImplPrivate::UpdateVideoMemoryUsageStats(
|
| - const gpu::VideoMemoryUsageStats& video_memory_usage_stats) {
|
| - GpuDataManagerImpl::UnlockedSession session(owner_);
|
| - observer_list_->Notify(FROM_HERE,
|
| - &GpuDataManagerObserver::OnVideoMemoryUsageStatsUpdate,
|
| - video_memory_usage_stats);
|
| -}
|
| -
|
| void GpuDataManagerImplPrivate::AppendRendererCommandLine(
|
| base::CommandLine* command_line) const {
|
| DCHECK(command_line);
|
|
|