gpu/command_buffer/service/gles2_cmd_decoder_mock.h - Issue 1135943002: Pull in various gpu/command_buffer fixes from chromium

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder_mock.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:

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 c58405bb2e792223fc0e51f4634e1e798cef9f3d..65df53c53dfdc02646ed27a10df1066c6792b281 100644

--- a/gpu/command_buffer/service/gles2_cmd_decoder_mock.h

+++ b/gpu/command_buffer/service/gles2_cmd_decoder_mock.h

@@ -124,9 +124,9 @@ class MockGLES2Decoder : public GLES2Decoder {

MOCK_METHOD0(GetTotalTextureUploadTime, base::TimeDelta());

MOCK_METHOD0(GetTotalProcessingCommandsTime, base::TimeDelta());

MOCK_METHOD1(AddProcessingCommandsTime, void(base::TimeDelta));

- MOCK_METHOD0(WasContextLost, bool());

- MOCK_METHOD0(WasContextLostByRobustnessExtension, bool());

- MOCK_METHOD1(LoseContext, void(uint32 reset_status));

+ MOCK_CONST_METHOD0(WasContextLost, bool());

+ MOCK_CONST_METHOD0(WasContextLostByRobustnessExtension, bool());

+ MOCK_METHOD1(MarkContextLost, void(gpu::error::ContextLostReason reason));

DISALLOW_COPY_AND_ASSIGN(MockGLES2Decoder);

};