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

Side by Side 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, 4 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 unified diff | Download patch | Annotate | Revision Log
Property Changes:
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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This file contains the mock GLES2Decoder class. 5 // This file contains the mock GLES2Decoder class.
6 6
7 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_MOCK_H_ 7 #ifndef GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_MOCK_H_
8 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_MOCK_H_ 8 #define GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_MOCK_H_
9 9
10 #include <vector> 10 #include <vector>
(...skipping 19 matching lines...) Expand all
30 virtual ~MockGLES2Decoder(); 30 virtual ~MockGLES2Decoder();
31 31
32 MOCK_METHOD6(Initialize, 32 MOCK_METHOD6(Initialize,
33 bool(const scoped_refptr<gfx::GLSurface>& surface, 33 bool(const scoped_refptr<gfx::GLSurface>& surface,
34 const scoped_refptr<gfx::GLContext>& context, 34 const scoped_refptr<gfx::GLContext>& context,
35 const gfx::Size& size, 35 const gfx::Size& size,
36 const DisallowedExtensions& disallowed_extensions, 36 const DisallowedExtensions& disallowed_extensions,
37 const char* allowed_extensions, 37 const char* allowed_extensions,
38 const std::vector<int32>& attribs)); 38 const std::vector<int32>& attribs));
39 MOCK_METHOD0(Destroy, void()); 39 MOCK_METHOD0(Destroy, void());
40 MOCK_METHOD4(MapExternalResource,
41 bool(resource_type::ResourceType resource_type,
42 uint32 resource_source_id,
43 GLES2Decoder* source_decoder,
44 uint32 resource_dest_id));
45 MOCK_METHOD2(SetParent, bool(GLES2Decoder* parent, uint32 parent_texture_id)); 40 MOCK_METHOD2(SetParent, bool(GLES2Decoder* parent, uint32 parent_texture_id));
46 MOCK_METHOD1(ResizeOffscreenFrameBuffer, void(const gfx::Size& size)); 41 MOCK_METHOD1(ResizeOffscreenFrameBuffer, void(const gfx::Size& size));
47 MOCK_METHOD0(UpdateOffscreenFrameBufferSize, bool()); 42 MOCK_METHOD0(UpdateOffscreenFrameBufferSize, bool());
48 MOCK_METHOD0(MakeCurrent, bool()); 43 MOCK_METHOD0(MakeCurrent, bool());
49 MOCK_METHOD1(GetServiceIdForTesting, uint32(uint32 client_id)); 44 MOCK_METHOD1(GetServiceIdForTesting, uint32(uint32 client_id));
50 MOCK_METHOD0(GetGLES2Util, GLES2Util*()); 45 MOCK_METHOD0(GetGLES2Util, GLES2Util*());
51 MOCK_METHOD0(GetGLSurface, gfx::GLSurface*()); 46 MOCK_METHOD0(GetGLSurface, gfx::GLSurface*());
52 MOCK_METHOD0(GetGLContext, gfx::GLContext*()); 47 MOCK_METHOD0(GetGLContext, gfx::GLContext*());
53 MOCK_METHOD0(GetContextGroup, ContextGroup*()); 48 MOCK_METHOD0(GetContextGroup, ContextGroup*());
54 MOCK_METHOD1(SetResizeCallback, void(Callback1<gfx::Size>::Type*)); 49 MOCK_METHOD1(SetResizeCallback, void(Callback1<gfx::Size>::Type*));
55 MOCK_METHOD1(SetSwapBuffersCallback, void(Callback0::Type*)); 50 MOCK_METHOD1(SetSwapBuffersCallback, void(Callback0::Type*));
56 MOCK_METHOD3(DoCommand, error::Error(unsigned int command, 51 MOCK_METHOD3(DoCommand, error::Error(unsigned int command,
57 unsigned int arg_count, 52 unsigned int arg_count,
58 const void* cmd_data)); 53 const void* cmd_data));
59 MOCK_METHOD2(GetServiceTextureId, bool(uint32 client_texture_id, 54 MOCK_METHOD2(GetServiceTextureId, bool(uint32 client_texture_id,
60 uint32* service_texture_id)); 55 uint32* service_texture_id));
61 MOCK_METHOD0(GetContextLostReason, error::ContextLostReason()); 56 MOCK_METHOD0(GetContextLostReason, error::ContextLostReason());
62 MOCK_CONST_METHOD1(GetCommandName, const char*(unsigned int command_id)); 57 MOCK_CONST_METHOD1(GetCommandName, const char*(unsigned int command_id));
63 58
64 DISALLOW_COPY_AND_ASSIGN(MockGLES2Decoder); 59 DISALLOW_COPY_AND_ASSIGN(MockGLES2Decoder);
65 }; 60 };
66 61
67 } // namespace gles2 62 } // namespace gles2
68 } // namespace gpu 63 } // namespace gpu
69 64
70 #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_MOCK_H_ 65 #endif // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_DECODER_MOCK_H_
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698