gpu/command_buffer/client/client_test_helper.h - Issue 962723002: Change CHROMIUM_image declarations to support multi planar input.

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/client/client_test_helper.h

Issue 962723002: Change CHROMIUM_image declarations to support multi planar input. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: reveman@ comments. Created 5 years, 9 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

« content/common/gpu/client/command_buffer_proxy_impl.cc ('K') | « gpu/command_buffer/build_gles2_cmd_buffer.py ('k') | gpu/command_buffer/client/client_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..f09e61e2b05387712e7b2787423593a9956d4b04 100644

--- a/gpu/command_buffer/client/client_test_helper.h

+++ b/gpu/command_buffer/client/client_test_helper.h

@@ -92,11 +92,12 @@ class MockClientGpuControl : public GpuControl {

virtual ~MockClientGpuControl();

MOCK_METHOD0(GetCapabilities, Capabilities());

- MOCK_METHOD4(CreateImage,

- int32(ClientBuffer buffer,

- size_t width,

- size_t height,

- unsigned internalformat));

+ // Workaround for MSVC warning on mock methods, see http://crbug.com/466689

+ int32_t CreateImage(ClientBuffer* const buffers,

+ size_t width,

+ size_t height,

+ unsigned internalformat);

+ MOCK_METHOD0(DoCreateImage, int32());

MOCK_METHOD1(DestroyImage, void(int32 id));

MOCK_METHOD4(CreateGpuMemoryBufferImage,

int32(size_t width,