| Index: gpu/ipc/service/gpu_memory_tracking.h
|
| diff --git a/content/common/gpu/gpu_memory_tracking.h b/gpu/ipc/service/gpu_memory_tracking.h
|
| similarity index 71%
|
| rename from content/common/gpu/gpu_memory_tracking.h
|
| rename to gpu/ipc/service/gpu_memory_tracking.h
|
| index 28892832f96732bd90eaf40f22361f205295a2db..35dd396d4344f02e5e15aa2f021033393e9a25e3 100644
|
| --- a/content/common/gpu/gpu_memory_tracking.h
|
| +++ b/gpu/ipc/service/gpu_memory_tracking.h
|
| @@ -2,22 +2,22 @@
|
| // 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_TRACKING_H_
|
| -#define CONTENT_COMMON_GPU_GPU_MEMORY_TRACKING_H_
|
| +#ifndef GPU_IPC_SERVICE_GPU_MEMORY_TRACKING_H_
|
| +#define GPU_IPC_SERVICE_GPU_MEMORY_TRACKING_H_
|
|
|
| #include <stdint.h>
|
|
|
| #include "base/process/process.h"
|
| -#include "content/common/content_export.h"
|
| #include "gpu/command_buffer/service/memory_tracking.h"
|
| +#include "gpu/gpu_export.h"
|
|
|
| -namespace content {
|
| +namespace gpu {
|
|
|
| class GpuMemoryManager;
|
|
|
| // All decoders in a context group point to a single GpuMemoryTrackingGroup,
|
| // which tracks GPU resource consumption for the entire context group.
|
| -class CONTENT_EXPORT GpuMemoryTrackingGroup {
|
| +class GPU_EXPORT GpuMemoryTrackingGroup {
|
| public:
|
| ~GpuMemoryTrackingGroup();
|
| void TrackMemoryAllocatedChange(uint64_t old_size, uint64_t new_size);
|
| @@ -26,7 +26,7 @@ class CONTENT_EXPORT GpuMemoryTrackingGroup {
|
| return pid_;
|
| }
|
| uint64_t GetSize() const { return size_; }
|
| - gpu::gles2::MemoryTracker* GetMemoryTracker() const {
|
| + gles2::MemoryTracker* GetMemoryTracker() const {
|
| return memory_tracker_;
|
| }
|
|
|
| @@ -34,7 +34,7 @@ class CONTENT_EXPORT GpuMemoryTrackingGroup {
|
| friend class GpuMemoryManager;
|
|
|
| GpuMemoryTrackingGroup(base::ProcessId pid,
|
| - gpu::gles2::MemoryTracker* memory_tracker,
|
| + gles2::MemoryTracker* memory_tracker,
|
| GpuMemoryManager* memory_manager);
|
|
|
| base::ProcessId pid_;
|
| @@ -44,10 +44,10 @@ class CONTENT_EXPORT GpuMemoryTrackingGroup {
|
| // non-surface clients should be hibernated.
|
| bool hibernated_;
|
|
|
| - gpu::gles2::MemoryTracker* memory_tracker_;
|
| + gles2::MemoryTracker* memory_tracker_;
|
| GpuMemoryManager* memory_manager_;
|
| };
|
|
|
| -} // namespace content
|
| +} // namespace gpu
|
|
|
| -#endif // CONTENT_COMMON_GPU_GPU_MEMORY_TRACKING_H_
|
| +#endif // GPU_IPC_SERVICE_GPU_MEMORY_TRACKING_H_
|
|
|