Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(843)

Unified Diff: cc/test/fake_web_graphics_context_3d.h

Issue 126973002: Decouple cc::FakeWebGraphicsContext3D from blink::WGC3D (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/resources/texture_mailbox_deleter_unittest.cc ('k') | cc/test/fake_web_graphics_context_3d.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 63405cb16d4ad7d7091757c869318abbe3b7352e..583ba2d012fc66dd84d94ef9a724aef8909a5b3d 100644
--- a/cc/test/fake_web_graphics_context_3d.h
+++ b/cc/test/fake_web_graphics_context_3d.h
@@ -13,7 +13,7 @@ namespace cc {
// WebGraphicsContext3D base class for use in unit tests.
// All operations are no-ops (returning 0 if necessary).
-class FakeWebGraphicsContext3D : public blink::WebGraphicsContext3D {
+class FakeWebGraphicsContext3D {
public:
FakeWebGraphicsContext3D();
virtual ~FakeWebGraphicsContext3D();
@@ -199,6 +199,7 @@ class FakeWebGraphicsContext3D : public blink::WebGraphicsContext3D {
virtual void enableVertexAttribArray(blink::WGC3Duint index) {}
virtual void finish() {}
virtual void flush() {}
+ virtual void shallowFlushCHROMIUM() {}
virtual void framebufferRenderbuffer(
blink::WGC3Denum target,
blink::WGC3Denum attachment,
@@ -215,11 +216,11 @@ class FakeWebGraphicsContext3D : public blink::WebGraphicsContext3D {
virtual bool getActiveAttrib(
blink::WebGLId program,
- blink::WGC3Duint index, ActiveInfo&);
+ blink::WGC3Duint index, blink::WebGraphicsContext3D::ActiveInfo&);
virtual bool getActiveUniform(
blink::WebGLId program,
blink::WGC3Duint index,
- ActiveInfo&);
+ blink::WebGraphicsContext3D::ActiveInfo&);
virtual void getAttachedShaders(
blink::WebGLId program,
blink::WGC3Dsizei max_count,
@@ -235,7 +236,6 @@ class FakeWebGraphicsContext3D : public blink::WebGraphicsContext3D {
blink::WGC3Denum target,
blink::WGC3Denum pname,
blink::WGC3Dint* value) {}
- virtual Attributes getContextAttributes();
virtual blink::WGC3Denum getError();
virtual void getFloatv(
blink::WGC3Denum pname,
@@ -578,7 +578,7 @@ class FakeWebGraphicsContext3D : public blink::WebGraphicsContext3D {
blink::WGC3Duint* params);
virtual void setContextLostCallback(
- WebGraphicsContextLostCallback* callback);
+ blink::WebGraphicsContext3D::WebGraphicsContextLostCallback* callback);
virtual void loseContextCHROMIUM(blink::WGC3Denum current,
blink::WGC3Denum other);
« no previous file with comments | « cc/resources/texture_mailbox_deleter_unittest.cc ('k') | cc/test/fake_web_graphics_context_3d.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698