Index: cc/trees/layer_tree_host_impl_unittest.cc |
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc |
index 6113bd411955d19eb68eff06e979d046807bcee1..f720d0a520d838d0fd37a53962820e6916da446d 100644 |
--- a/cc/trees/layer_tree_host_impl_unittest.cc |
+++ b/cc/trees/layer_tree_host_impl_unittest.cc |
@@ -3529,27 +3529,27 @@ class FakeLayerWithQuads : public LayerImpl { |
class MockContext : public TestWebGraphicsContext3D { |
public: |
- MOCK_METHOD1(useProgram, void(blink::WebGLId program)); |
- MOCK_METHOD5(uniform4f, void(blink::WGC3Dint location, |
- blink::WGC3Dfloat x, |
- blink::WGC3Dfloat y, |
- blink::WGC3Dfloat z, |
- blink::WGC3Dfloat w)); |
- MOCK_METHOD4(uniformMatrix4fv, void(blink::WGC3Dint location, |
- blink::WGC3Dsizei count, |
- blink::WGC3Dboolean transpose, |
- const blink::WGC3Dfloat* value)); |
- MOCK_METHOD4(drawElements, void(blink::WGC3Denum mode, |
- blink::WGC3Dsizei count, |
- blink::WGC3Denum type, |
- blink::WGC3Dintptr offset)); |
+ MOCK_METHOD1(useProgram, void(GLuint program)); |
+ MOCK_METHOD5(uniform4f, void(GLint location, |
+ GLfloat x, |
+ GLfloat y, |
+ GLfloat z, |
+ GLfloat w)); |
+ MOCK_METHOD4(uniformMatrix4fv, void(GLint location, |
+ GLsizei count, |
+ GLboolean transpose, |
+ const GLfloat* value)); |
+ MOCK_METHOD4(drawElements, void(GLenum mode, |
+ GLsizei count, |
+ GLenum type, |
+ GLintptr offset)); |
MOCK_METHOD0(getRequestableExtensionsCHROMIUM, blink::WebString()); |
- MOCK_METHOD1(enable, void(blink::WGC3Denum cap)); |
- MOCK_METHOD1(disable, void(blink::WGC3Denum cap)); |
- MOCK_METHOD4(scissor, void(blink::WGC3Dint x, |
- blink::WGC3Dint y, |
- blink::WGC3Dsizei width, |
- blink::WGC3Dsizei height)); |
+ MOCK_METHOD1(enable, void(GLenum cap)); |
+ MOCK_METHOD1(disable, void(GLenum cap)); |
+ MOCK_METHOD4(scissor, void(GLint x, |
+ GLint y, |
+ GLsizei width, |
+ GLsizei height)); |
}; |
class MockContextHarness { |
@@ -3870,11 +3870,11 @@ TEST_F(LayerTreeHostImplTest, LayersFreeTextures) { |
class MockDrawQuadsToFillScreenContext : public TestWebGraphicsContext3D { |
public: |
- MOCK_METHOD1(useProgram, void(blink::WebGLId program)); |
- MOCK_METHOD4(drawElements, void(blink::WGC3Denum mode, |
- blink::WGC3Dsizei count, |
- blink::WGC3Denum type, |
- blink::WGC3Dintptr offset)); |
+ MOCK_METHOD1(useProgram, void(GLuint program)); |
+ MOCK_METHOD4(drawElements, void(GLenum mode, |
+ GLsizei count, |
+ GLenum type, |
+ GLintptr offset)); |
}; |
TEST_F(LayerTreeHostImplTest, HasTransparentBackground) { |