Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

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

Issue 1823763003: Move more files to gpu/ipc/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed GYP build Created 4 years, 9 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
« no previous file with comments | « content/common/gpu/gpu_channel_test_common.cc ('k') | content/common/gpu/gpu_memory_uma_stats.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 57b3e9805dec291799ebaf675cff550126a1f771..2e6a10342791ff9703f1cc4ba89c68cb22ebaaa5 100644
--- a/content/common/gpu/gpu_memory_manager.cc
+++ b/content/common/gpu/gpu_memory_manager.cc
@@ -15,9 +15,9 @@
#include "content/common/gpu/gpu_channel_manager.h"
#include "content/common/gpu/gpu_channel_manager_delegate.h"
#include "content/common/gpu/gpu_memory_tracking.h"
-#include "content/common/gpu/gpu_memory_uma_stats.h"
#include "gpu/command_buffer/common/gpu_memory_allocation.h"
#include "gpu/command_buffer/service/gpu_switches.h"
+#include "gpu/ipc/common/gpu_memory_uma_stats.h"
#include "gpu/ipc/common/memory_stats.h"
using gpu::MemoryAllocation;
@@ -116,7 +116,7 @@ void GpuMemoryManager::GetVideoMemoryUsageStats(
void GpuMemoryManager::SendUmaStatsToHost() {
if (!channel_manager_)
return;
- GPUMemoryUmaStats params;
+ gpu::GPUMemoryUmaStats params;
params.bytes_allocated_current = GetCurrentUsage();
params.bytes_allocated_max = bytes_allocated_historical_max_;
params.context_group_count = static_cast<uint32_t>(tracking_groups_.size());
« no previous file with comments | « content/common/gpu/gpu_channel_test_common.cc ('k') | content/common/gpu/gpu_memory_uma_stats.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698