| Index: gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
|
| diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
|
| index c8505c104936ba1d22264b35125e12000a275fbf..9bfe52a3b9469719425b5e2658c8b180b2cbe6e4 100644
|
| --- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
|
| +++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
|
| @@ -95,6 +95,10 @@ class GLES2DecoderTestBase : public testing::Test {
|
| return reinterpret_cast<T>(ptr);
|
| }
|
|
|
| + gfx::GLImage* GetImage(GLuint image_id) {
|
| + return engine_->GetImage(image_id);
|
| + }
|
| +
|
| IdAllocatorInterface* GetIdAllocator(GLuint namespace_id) {
|
| return group_->GetIdAllocator(namespace_id);
|
| }
|
| @@ -476,6 +480,9 @@ class GLES2DecoderTestBase : public testing::Test {
|
| static const GLint kInvalidUniformLocation = 30;
|
| static const GLint kBadUniformIndex = 1000;
|
|
|
| + static const int32 kImageId = 801;
|
| + static const int32 kInvalidImageId = 802;
|
| +
|
| // Use StrictMock to make 100% sure we know how GL will be called.
|
| scoped_ptr< ::testing::StrictMock< ::gfx::MockGLInterface> > gl_;
|
| scoped_refptr<gfx::GLSurfaceStub> surface_;
|
| @@ -526,10 +533,13 @@ class GLES2DecoderTestBase : public testing::Test {
|
| // Overridden from CommandBufferEngine.
|
| virtual int32 GetGetOffset() OVERRIDE;
|
|
|
| + virtual gfx::GLImage* GetImage(int32 image_id) OVERRIDE;
|
| +
|
| private:
|
| scoped_ptr<int8[]> data_;
|
| gpu::Buffer valid_buffer_;
|
| gpu::Buffer invalid_buffer_;
|
| + scoped_refptr<gfx::GLImage> valid_image_;
|
| };
|
|
|
| void AddExpectationsForVertexAttribManager();
|
|
|