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

Unified Diff: gpu/command_buffer/common/command_buffer_mock.h

Issue 367002: Added Pepper 3D render context that instantiates the GPU plugin.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years 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
« no previous file with comments | « gpu/command_buffer/common/command_buffer.h ('k') | gpu/command_buffer/common/gles2_cmd_format.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/common/command_buffer_mock.h
===================================================================
--- gpu/command_buffer/common/command_buffer_mock.h (revision 35153)
+++ gpu/command_buffer/common/command_buffer_mock.h (working copy)
@@ -16,13 +16,13 @@
public:
MockCommandBuffer() {
ON_CALL(*this, GetRingBuffer())
- .WillByDefault(testing::Return(static_cast<base::SharedMemory*>(NULL)));
+ .WillByDefault(testing::Return(Buffer()));
ON_CALL(*this, GetTransferBuffer(testing::_))
- .WillByDefault(testing::Return(static_cast<base::SharedMemory*>(NULL)));
+ .WillByDefault(testing::Return(Buffer()));
}
- MOCK_METHOD1(Initialize, base::SharedMemory*(int32 size));
- MOCK_METHOD0(GetRingBuffer, base::SharedMemory*());
+ MOCK_METHOD1(Initialize, bool(int32 size));
+ MOCK_METHOD0(GetRingBuffer, Buffer());
MOCK_METHOD0(GetSize, int32());
MOCK_METHOD1(SyncOffsets, int32(int32 put_offset));
MOCK_METHOD0(GetGetOffset, int32());
@@ -31,7 +31,7 @@
MOCK_METHOD1(SetPutOffsetChangeCallback, void(Callback0::Type* callback));
MOCK_METHOD1(CreateTransferBuffer, int32(size_t size));
MOCK_METHOD1(DestroyTransferBuffer, void(int32 handle));
- MOCK_METHOD1(GetTransferBuffer, base::SharedMemory*(int32 handle));
+ MOCK_METHOD1(GetTransferBuffer, Buffer(int32 handle));
MOCK_METHOD0(GetToken, int32());
MOCK_METHOD1(SetToken, void(int32 token));
MOCK_METHOD0(ResetParseError, int32());
« no previous file with comments | « gpu/command_buffer/common/command_buffer.h ('k') | gpu/command_buffer/common/gles2_cmd_format.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698