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

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

Issue 1135943002: Pull in various gpu/command_buffer fixes from chromium (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 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/client/client_test_helper.h
diff --git a/gpu/command_buffer/client/client_test_helper.h b/gpu/command_buffer/client/client_test_helper.h
index 46e343d2a5102f8141be8a0d8bb9a6bfcbd6bddc..c155bf1171758e91ef087bbab6abe2bc133b85e6 100644
--- a/gpu/command_buffer/client/client_test_helper.h
+++ b/gpu/command_buffer/client/client_test_helper.h
@@ -63,14 +63,14 @@ class MockCommandBufferBase : public CommandBufferServiceBase {
class MockClientCommandBuffer : public MockCommandBufferBase {
public:
MockClientCommandBuffer();
- virtual ~MockClientCommandBuffer();
+ ~MockClientCommandBuffer() override;
// This is so we can use all the gmock functions when Flush is called.
MOCK_METHOD0(OnFlush, void());
MOCK_METHOD1(DestroyTransferBuffer, void(int32 id));
- virtual void Flush(int32 put_offset) override;
- virtual void OrderingBarrier(int32 put_offset) override;
+ void Flush(int32 put_offset) override;
+ void OrderingBarrier(int32 put_offset) override;
void DelegateToFake();
};
« no previous file with comments | « gpu/command_buffer/client/client_context_state_impl_autogen.h ('k') | gpu/command_buffer/client/gles2_c_lib_autogen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698