Index: gpu/ipc/service/gpu_memory_manager.cc |
diff --git a/content/common/gpu/gpu_memory_manager.cc b/gpu/ipc/service/gpu_memory_manager.cc |
similarity index 89% |
rename from content/common/gpu/gpu_memory_manager.cc |
rename to gpu/ipc/service/gpu_memory_manager.cc |
index 2e6a10342791ff9703f1cc4ba89c68cb22ebaaa5..75bde4c24ef98b1679e7902375dc711eacff3cbe 100644 |
--- a/content/common/gpu/gpu_memory_manager.cc |
+++ b/gpu/ipc/service/gpu_memory_manager.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "content/common/gpu/gpu_memory_manager.h" |
+#include "gpu/ipc/service/gpu_memory_manager.h" |
#include <algorithm> |
@@ -12,17 +12,15 @@ |
#include "base/process/process_handle.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/trace_event/trace_event.h" |
-#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 "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" |
+#include "gpu/ipc/service/gpu_channel_manager.h" |
+#include "gpu/ipc/service/gpu_channel_manager_delegate.h" |
+#include "gpu/ipc/service/gpu_memory_tracking.h" |
-using gpu::MemoryAllocation; |
- |
-namespace content { |
+namespace gpu { |
namespace { |
const uint64_t kBytesAllocatedStep = 16 * 1024 * 1024; |
@@ -68,7 +66,7 @@ bool GpuMemoryManager::EnsureGPUMemoryAvailable(uint64_t /* size_needed */) { |
} |
uint64_t GpuMemoryManager::GetTrackerMemoryUsage( |
- gpu::gles2::MemoryTracker* tracker) const { |
+ gles2::MemoryTracker* tracker) const { |
TrackingGroupMap::const_iterator tracking_group_it = |
tracking_groups_.find(tracker); |
DCHECK(tracking_group_it != tracking_groups_.end()); |
@@ -76,7 +74,7 @@ uint64_t GpuMemoryManager::GetTrackerMemoryUsage( |
} |
GpuMemoryTrackingGroup* GpuMemoryManager::CreateTrackingGroup( |
- base::ProcessId pid, gpu::gles2::MemoryTracker* memory_tracker) { |
+ base::ProcessId pid, gles2::MemoryTracker* memory_tracker) { |
GpuMemoryTrackingGroup* tracking_group = new GpuMemoryTrackingGroup( |
pid, memory_tracker, this); |
DCHECK(!tracking_groups_.count(tracking_group->GetMemoryTracker())); |
@@ -92,7 +90,7 @@ void GpuMemoryManager::OnDestroyTrackingGroup( |
} |
void GpuMemoryManager::GetVideoMemoryUsageStats( |
- gpu::VideoMemoryUsageStats* video_memory_usage_stats) const { |
+ VideoMemoryUsageStats* 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 = |
@@ -116,10 +114,10 @@ void GpuMemoryManager::GetVideoMemoryUsageStats( |
void GpuMemoryManager::SendUmaStatsToHost() { |
if (!channel_manager_) |
return; |
- gpu::GPUMemoryUmaStats params; |
+ 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()); |
channel_manager_->delegate()->GpuMemoryUmaStats(params); |
} |
-} // namespace content |
+} // namespace gpu |