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

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

Issue 14308014: Clean up of GLES2 Command Decoder by moving some of the error state into a separate class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge error. Created 7 years, 8 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
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_autogen.h ('k') | gpu/command_buffer/service/query_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder_mock.h
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_mock.h b/gpu/command_buffer/service/gles2_cmd_decoder_mock.h
index 64f7f4c5a491ff1d52772b11f290e0f138d54b20..624b6f945461ee30a115ff13c37c3eb25ed20d3e 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_mock.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_mock.h
@@ -25,6 +25,7 @@ class StreamTextureManager;
namespace gles2 {
class ContextGroup;
+class ErrorState;
class QueryManager;
class MockGLES2Decoder : public GLES2Decoder {
@@ -89,26 +90,7 @@ class MockGLES2Decoder : public GLES2Decoder {
int width,
int height,
bool is_texture_immutable));
- MOCK_METHOD0(GetGLError, uint32());
- MOCK_METHOD5(SetGLError, void(
- const char* filename, int line,
- unsigned error, const char* function_name, const char* msg));
- MOCK_METHOD5(SetGLErrorInvalidEnum, void(
- const char* filename, int line,
- const char* function_name, unsigned value, const char* label));
- MOCK_METHOD6(SetGLErrorInvalidParam, void(
- const char* filename,
- int line,
- unsigned error,
- const char* function_name,
- unsigned pname,
- int param));
- MOCK_METHOD3(PeekGLError, unsigned(
- const char* file, int line, const char* filename));
- MOCK_METHOD3(CopyRealGLErrorsToWrapper, void(
- const char* file, int line, const char* filename));
- MOCK_METHOD3(ClearRealGLErrors, void(
- const char* file, int line, const char* filename));
+ MOCK_METHOD0(GetErrorState, ErrorState *());
MOCK_METHOD0(GetLogger, Logger*());
MOCK_METHOD1(SetShaderCacheCallback,
« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder_autogen.h ('k') | gpu/command_buffer/service/query_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698