summaryrefslogtreecommitdiffstats
path: root/content/common/gpu/gpu_memory_manager.h
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 20:16:19 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-22 20:16:19 +0000
commiteb398193640924b8e55c6b2d00077838146ea8eb (patch)
treefc832fdabf40bad4ea19253b19216f1111fdc166 /content/common/gpu/gpu_memory_manager.h
parentf6b218e0969ab52a1a623260a8242030f8aeef31 (diff)
downloadchromium_src-eb398193640924b8e55c6b2d00077838146ea8eb.zip
chromium_src-eb398193640924b8e55c6b2d00077838146ea8eb.tar.gz
chromium_src-eb398193640924b8e55c6b2d00077838146ea8eb.tar.bz2
Move a bunch of code in content\common (as well as a few left in renderer) to the content namespace.
Review URL: https://codereview.chromium.org/11227033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/gpu/gpu_memory_manager.h')
-rw-r--r--content/common/gpu/gpu_memory_manager.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/content/common/gpu/gpu_memory_manager.h b/content/common/gpu/gpu_memory_manager.h
index a3a65cc..1256bb7 100644
--- a/content/common/gpu/gpu_memory_manager.h
+++ b/content/common/gpu/gpu_memory_manager.h
@@ -19,20 +19,24 @@
#include "content/public/common/gpu_memory_stats.h"
#include "ui/gfx/size.h"
+namespace content {
class GpuCommandBufferStubBase;
-class GpuMemoryTrackingGroup;
+}
#if defined(COMPILER_GCC)
namespace BASE_HASH_NAMESPACE {
template<>
-struct hash<GpuCommandBufferStubBase*> {
- size_t operator()(GpuCommandBufferStubBase* ptr) const {
+struct hash<content::GpuCommandBufferStubBase*> {
+ size_t operator()(content::GpuCommandBufferStubBase* ptr) const {
return hash<size_t>()(reinterpret_cast<size_t>(ptr));
}
};
} // namespace BASE_HASH_NAMESPACE
#endif // COMPILER
+namespace content {
+class GpuMemoryTrackingGroup;
+
class CONTENT_EXPORT GpuMemoryManagerClient {
public:
virtual ~GpuMemoryManagerClient() {}
@@ -176,6 +180,8 @@ size_t GetMaximumTabAllocation() const {
DISALLOW_COPY_AND_ASSIGN(GpuMemoryManager);
};
+} // namespace content
+
#endif
#endif // CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_