Index: gpu/ipc/service/gpu_memory_manager.h |
diff --git a/content/common/gpu/gpu_memory_manager.h b/gpu/ipc/service/gpu_memory_manager.h |
similarity index 77% |
rename from content/common/gpu/gpu_memory_manager.h |
rename to gpu/ipc/service/gpu_memory_manager.h |
index 4135d2fbd9a498f06ee6088e51395ac28ffa2b04..5d1569a067d432069604b980eebaa4f719c701a7 100644 |
--- a/content/common/gpu/gpu_memory_manager.h |
+++ b/gpu/ipc/service/gpu_memory_manager.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_ |
-#define CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_ |
+#ifndef GPU_IPC_SERVICE_GPU_MEMORY_MANAGER_H_ |
+#define GPU_IPC_SERVICE_GPU_MEMORY_MANAGER_H_ |
#include <stdint.h> |
@@ -15,20 +15,17 @@ |
#include "base/gtest_prod_util.h" |
#include "base/macros.h" |
#include "base/memory/weak_ptr.h" |
-#include "content/common/content_export.h" |
#include "gpu/command_buffer/common/gpu_memory_allocation.h" |
#include "gpu/command_buffer/service/memory_tracking.h" |
+#include "gpu/gpu_export.h" |
namespace gpu { |
-struct VideoMemoryUsageStats; |
-} |
- |
-namespace content { |
class GpuChannelManager; |
class GpuMemoryTrackingGroup; |
+struct VideoMemoryUsageStats; |
-class CONTENT_EXPORT GpuMemoryManager : |
+class GPU_EXPORT GpuMemoryManager : |
public base::SupportsWeakPtr<GpuMemoryManager> { |
public: |
explicit GpuMemoryManager(GpuChannelManager* channel_manager); |
@@ -36,19 +33,19 @@ class CONTENT_EXPORT GpuMemoryManager : |
// Retrieve GPU Resource consumption statistics for the task manager |
void GetVideoMemoryUsageStats( |
- gpu::VideoMemoryUsageStats* video_memory_usage_stats) const; |
+ VideoMemoryUsageStats* video_memory_usage_stats) const; |
GpuMemoryTrackingGroup* CreateTrackingGroup( |
- base::ProcessId pid, gpu::gles2::MemoryTracker* memory_tracker); |
+ base::ProcessId pid, gles2::MemoryTracker* memory_tracker); |
- uint64_t GetTrackerMemoryUsage(gpu::gles2::MemoryTracker* tracker) const; |
+ uint64_t GetTrackerMemoryUsage(gles2::MemoryTracker* tracker) const; |
private: |
friend class GpuMemoryManagerTest; |
friend class GpuMemoryTrackingGroup; |
friend class GpuMemoryManagerClientState; |
- typedef std::map<gpu::gles2::MemoryTracker*, GpuMemoryTrackingGroup*> |
+ typedef std::map<gles2::MemoryTracker*, GpuMemoryTrackingGroup*> |
TrackingGroupMap; |
// Send memory usage stats to the browser process. |
@@ -76,6 +73,6 @@ class CONTENT_EXPORT GpuMemoryManager : |
DISALLOW_COPY_AND_ASSIGN(GpuMemoryManager); |
}; |
-} // namespace content |
+} // namespace gpu |
-#endif // CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_ |
+#endif // GPU_IPC_SERVICE_GPU_MEMORY_MANAGER_H_ |