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

Unified Diff: gpu/command_buffer/client/gpu_memory_buffer_manager.h

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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
Index: gpu/command_buffer/client/gpu_memory_buffer_manager.h
diff --git a/cc/resources/gpu_memory_buffer_manager.h b/gpu/command_buffer/client/gpu_memory_buffer_manager.h
similarity index 67%
rename from cc/resources/gpu_memory_buffer_manager.h
rename to gpu/command_buffer/client/gpu_memory_buffer_manager.h
index 52434e054d2a172a06c67baa83fc6462e4cb6e97..cc422bfcba78c5fb75253a82bf1a4e227ef501bb 100644
--- a/cc/resources/gpu_memory_buffer_manager.h
+++ b/gpu/command_buffer/client/gpu_memory_buffer_manager.h
@@ -2,18 +2,20 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_RESOURCES_GPU_MEMORY_BUFFER_MANAGER_H_
-#define CC_RESOURCES_GPU_MEMORY_BUFFER_MANAGER_H_
+#ifndef GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_MANAGER_H_
+#define GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_MANAGER_H_
#include "base/memory/scoped_ptr.h"
-#include "cc/base/cc_export.h"
+#include "gpu/gpu_export.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/gpu_memory_buffer.h"
-namespace cc {
+namespace gpu {
-class CC_EXPORT GpuMemoryBufferManager {
+class GPU_EXPORT GpuMemoryBufferManager {
public:
+ GpuMemoryBufferManager();
+
// Allocates a GpuMemoryBuffer that can be shared with another process.
virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBuffer(
const gfx::Size& size,
@@ -26,9 +28,9 @@ class CC_EXPORT GpuMemoryBufferManager {
ClientBuffer buffer) = 0;
protected:
- virtual ~GpuMemoryBufferManager() {}
+ virtual ~GpuMemoryBufferManager();
};
-} // namespace cc
+} // namespace gpu
-#endif // CC_RESOURCES_GPU_MEMORY_BUFFER_MANAGER_H_
+#endif // GPU_COMMAND_BUFFER_CLIENT_GPU_MEMORY_BUFFER_MANAGER_H_
« no previous file with comments | « gpu/command_buffer/client/gles2_implementation_unittest.cc ('k') | gpu/command_buffer/client/gpu_memory_buffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698