gpu/command_buffer/service/gles2_cmd_decoder_mock.h - Issue 7518016: Revert 94743 - Allow the renderer process to map textures from one context into another.

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 7518016: Revert 94743 - Allow the renderer process to map textures from one context into another. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 5 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/service/gles2_cmd_decoder_mock.h

===================================================================

--- gpu/command_buffer/service/gles2_cmd_decoder_mock.h (revision 94807)

+++ gpu/command_buffer/service/gles2_cmd_decoder_mock.h (working copy)

@@ -37,11 +37,6 @@

const char* allowed_extensions,

const std::vector<int32>& attribs));

MOCK_METHOD0(Destroy, void());

- MOCK_METHOD4(MapExternalResource,

- bool(resource_type::ResourceType resource_type,

- uint32 resource_source_id,

- GLES2Decoder* source_decoder,

- uint32 resource_dest_id));

MOCK_METHOD2(SetParent, bool(GLES2Decoder* parent, uint32 parent_texture_id));

MOCK_METHOD1(ResizeOffscreenFrameBuffer, void(const gfx::Size& size));

MOCK_METHOD0(UpdateOffscreenFrameBufferSize, bool());

Property changes on: gpu/command_buffer/service/gles2_cmd_decoder_mock.h

___________________________________________________________________

Added: svn:mergeinfo

Merged /trunk/src/o3d/gpu/command_buffer/service/gles2_cmd_decoder_mock.h:r32866-32958

Merged /branches/chrome_webkit_merge_branch/o3d/gpu/command_buffer/service/gles2_cmd_decoder_mock.h:r69-2775

« no previous file with comments | « gpu/command_buffer/service/gles2_cmd_decoder.cc ('k') | gpu/command_buffer/service/gpu_scheduler.h » ('j') | no next file with comments »