Index: cc/test/fake_web_graphics_context_3d.h |
diff --git a/cc/test/fake_web_graphics_context_3d.h b/cc/test/fake_web_graphics_context_3d.h |
index 4e753f70f03f44aaee5372a9fc2ebdca1526f560..7d4b62cb1e5cc3582b65b685e2770d19962469a9 100644 |
--- a/cc/test/fake_web_graphics_context_3d.h |
+++ b/cc/test/fake_web_graphics_context_3d.h |
@@ -5,7 +5,7 @@ |
#ifndef FakeWebGraphicsContext3D_h |
#define FakeWebGraphicsContext3D_h |
-#include "GraphicsContext3D.h" |
+#include "third_party/khronos/GLES2/gl2.h" |
#include <public/WebGraphicsContext3D.h> |
namespace WebKit { |
@@ -76,7 +76,7 @@ public: |
virtual WGC3Denum checkFramebufferStatus(WGC3Denum target) |
{ |
- return cc::GraphicsContext3D::FRAMEBUFFER_COMPLETE; |
+ return GL_FRAMEBUFFER_COMPLETE; |
} |
virtual void clear(WGC3Dbitfield mask) { } |
@@ -122,13 +122,13 @@ public: |
virtual void getIntegerv(WGC3Denum pname, WGC3Dint* value) |
{ |
- if (pname == cc::GraphicsContext3D::MAX_TEXTURE_SIZE) |
+ if (pname == GL_MAX_TEXTURE_SIZE) |
*value = 1024; |
} |
virtual void getProgramiv(WebGLId program, WGC3Denum pname, WGC3Dint* value) |
{ |
- if (pname == cc::GraphicsContext3D::LINK_STATUS) |
+ if (pname == GL_LINK_STATUS) |
*value = 1; |
} |
@@ -137,7 +137,7 @@ public: |
virtual void getShaderiv(WebGLId shader, WGC3Denum pname, WGC3Dint* value) |
{ |
- if (pname == cc::GraphicsContext3D::COMPILE_STATUS) |
+ if (pname == GL_COMPILE_STATUS) |
*value = 1; |
} |
@@ -244,11 +244,11 @@ public: |
virtual WebGLId createQueryEXT() { return 1; } |
virtual void deleteQueryEXT(WebGLId) { } |
- virtual GC3Dboolean isQueryEXT(WebGLId) { return true; } |
- virtual void beginQueryEXT(GC3Denum, WebGLId) { } |
- virtual void endQueryEXT(GC3Denum) { } |
- virtual void getQueryivEXT(GC3Denum, GC3Denum, GC3Dint*) { } |
- virtual void getQueryObjectuivEXT(WebGLId, GC3Denum, GC3Duint*) { } |
+ virtual WGC3Dboolean isQueryEXT(WebGLId) { return true; } |
+ virtual void beginQueryEXT(WGC3Denum, WebGLId) { } |
+ virtual void endQueryEXT(WGC3Denum) { } |
+ virtual void getQueryivEXT(WGC3Denum, WGC3Denum, WGC3Dint*) { } |
+ virtual void getQueryObjectuivEXT(WebGLId, WGC3Denum, WGC3Duint*) { } |
protected: |
unsigned m_nextTextureId; |