Chromium Code Reviews| Index: cc/test/test_web_graphics_context_3d.h |
| diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h |
| index 0d3c122d008bce69553a9a12e0c267b2f02a7c07..95df8081bb1f1072ed1b4e8da671857ead1b4a13 100644 |
| --- a/cc/test/test_web_graphics_context_3d.h |
| +++ b/cc/test/test_web_graphics_context_3d.h |
| @@ -36,7 +36,6 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D { |
| int width, int height, float scale_factor); |
| virtual bool isContextLost(); |
| - virtual WebKit::WGC3Denum getGraphicsResetStatusARB(); |
| virtual void attachShader(WebKit::WebGLId program, WebKit::WebGLId shader); |
| virtual void bindFramebuffer( |
| @@ -185,6 +184,7 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D { |
| return ContainsKey(used_textures_, texture); |
| } |
| void ResetUsedTextures() { used_textures_.clear(); } |
| + unsigned AllocateTestTextureForExternalUse(); |
|
piman
2013/11/01 23:15:35
leftover/merge conflict?
|
| void set_support_swapbuffers_complete_callback(bool support) { |
| test_capabilities_.swapbuffers_complete_callback = support; |