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

Unified Diff: gpu/command_buffer/service/command_buffer_service.h

Issue 10441140: Make context groups share a TextureBufferManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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/service/command_buffer_service.h
diff --git a/gpu/command_buffer/service/command_buffer_service.h b/gpu/command_buffer/service/command_buffer_service.h
index 77fe95163a81bf6f2870b78de61ff16ccadfd671..c3bb8413b76214e2802b856968de6a8efbe40514 100644
--- a/gpu/command_buffer/service/command_buffer_service.h
+++ b/gpu/command_buffer/service/command_buffer_service.h
@@ -6,8 +6,6 @@
#define GPU_COMMAND_BUFFER_SERVICE_COMMAND_BUFFER_SERVICE_H_
#include "base/callback.h"
-#include "base/memory/linked_ptr.h"
-#include "base/memory/scoped_ptr.h"
#include "base/shared_memory.h"
#include "gpu/command_buffer/common/command_buffer.h"
#include "gpu/command_buffer/common/command_buffer_shared.h"
@@ -21,7 +19,8 @@ class TransferBufferManagerInterface;
class GPU_EXPORT CommandBufferService : public CommandBuffer {
public:
typedef base::Callback<bool(int32)> GetBufferChangedCallback;
- CommandBufferService();
+ explicit CommandBufferService(
+ TransferBufferManagerInterface* transfer_buffer_manager);
virtual ~CommandBufferService();
// CommandBuffer implementation:
@@ -72,11 +71,13 @@ class GPU_EXPORT CommandBufferService : public CommandBuffer {
base::Closure put_offset_change_callback_;
GetBufferChangedCallback get_buffer_change_callback_;
base::Closure parse_error_callback_;
- scoped_ptr<TransferBufferManagerInterface> transfer_buffer_manager_;
+ TransferBufferManagerInterface* transfer_buffer_manager_;
int32 token_;
uint32 generation_;
error::Error error_;
error::ContextLostReason context_lost_reason_;
+
+ DISALLOW_COPY_AND_ASSIGN(CommandBufferService);
};
} // namespace gpu

Powered by Google App Engine
This is Rietveld 408576698