| Index: cc/trees/layer_tree_host_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
|
| index 02937bce0622a64a14e3e131a1c2b440171d4a98..6b220c8d1cb0b5545ddec0b1a1013ca7adf50f48 100644
|
| --- a/cc/trees/layer_tree_host_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_unittest.cc
|
| @@ -2809,26 +2809,26 @@ class MockIOSurfaceWebGraphicsContext3D : public TestWebGraphicsContext3D {
|
| test_capabilities_.texture_rectangle = true;
|
| }
|
|
|
| - virtual blink::WebGLId createTexture() OVERRIDE {
|
| + virtual GLuint createTexture() OVERRIDE {
|
| return 1;
|
| }
|
|
|
| - MOCK_METHOD1(activeTexture, void(blink::WGC3Denum texture));
|
| - MOCK_METHOD2(bindTexture, void(blink::WGC3Denum target,
|
| - blink::WebGLId texture_id));
|
| - MOCK_METHOD3(texParameteri, void(blink::WGC3Denum target,
|
| - blink::WGC3Denum pname,
|
| - blink::WGC3Dint param));
|
| - MOCK_METHOD5(texImageIOSurface2DCHROMIUM, void(blink::WGC3Denum target,
|
| - blink::WGC3Dint width,
|
| - blink::WGC3Dint height,
|
| - blink::WGC3Duint ioSurfaceId,
|
| - blink::WGC3Duint plane));
|
| - MOCK_METHOD4(drawElements, void(blink::WGC3Denum mode,
|
| - blink::WGC3Dsizei count,
|
| - blink::WGC3Denum type,
|
| - blink::WGC3Dintptr offset));
|
| - MOCK_METHOD1(deleteTexture, void(blink::WGC3Denum texture));
|
| + MOCK_METHOD1(activeTexture, void(GLenum texture));
|
| + MOCK_METHOD2(bindTexture, void(GLenum target,
|
| + GLuint texture_id));
|
| + MOCK_METHOD3(texParameteri, void(GLenum target,
|
| + GLenum pname,
|
| + GLint param));
|
| + MOCK_METHOD5(texImageIOSurface2DCHROMIUM, void(GLenum target,
|
| + GLint width,
|
| + GLint height,
|
| + GLuint ioSurfaceId,
|
| + GLuint plane));
|
| + MOCK_METHOD4(drawElements, void(GLenum mode,
|
| + GLsizei count,
|
| + GLenum type,
|
| + GLintptr offset));
|
| + MOCK_METHOD1(deleteTexture, void(GLenum texture));
|
| };
|
|
|
|
|
|
|