summaryrefslogtreecommitdiffstats
path: root/cc/test/test_web_graphics_context_3d.h
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-15 19:15:07 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-15 19:15:07 +0000
commitd0ae42e25411518364942eeaef32badf1bbd087e (patch)
tree3d1628048e3b21ae49279fa6a9af29ffb3f48c56 /cc/test/test_web_graphics_context_3d.h
parentfa3416f9fbff598a69bd91f457a36471dfb9de57 (diff)
downloadchromium_src-d0ae42e25411518364942eeaef32badf1bbd087e.zip
chromium_src-d0ae42e25411518364942eeaef32badf1bbd087e.tar.gz
chromium_src-d0ae42e25411518364942eeaef32badf1bbd087e.tar.bz2
Remove remaining blink/WebKit refs from cc
This gets rid of the remaining blink references from cc: *) We don't use ActiveInfo in any production code, so we can remove the test fakes that use them *) The lost context callback is only used between TestContextProvider and TestWGC3D, so it can be routed directly using the base callback system instead of a function pointer type from blink BUG=181120 Review URL: https://codereview.chromium.org/135053002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244958 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test/test_web_graphics_context_3d.h')
-rw-r--r--cc/test/test_web_graphics_context_3d.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/cc/test/test_web_graphics_context_3d.h b/cc/test/test_web_graphics_context_3d.h
index 81a43b5..2b15976 100644
--- a/cc/test/test_web_graphics_context_3d.h
+++ b/cc/test/test_web_graphics_context_3d.h
@@ -7,6 +7,7 @@
#include <vector>
+#include "base/callback.h"
#include "base/compiler_specific.h"
#include "base/containers/hash_tables.h"
#include "base/containers/scoped_ptr_hash_map.h"
@@ -31,6 +32,10 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
virtual ~TestWebGraphicsContext3D();
+ void set_context_lost_callback(const base::Closure& callback) {
+ context_lost_callback_ = callback;
+ }
+
virtual void reshapeWithScaleFactor(int width,
int height,
float scale_factor);
@@ -137,10 +142,6 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
virtual void consumeTextureCHROMIUM(GLenum target,
const GLbyte* mailbox) { }
- virtual void setContextLostCallback(
- blink::WebGraphicsContext3D::WebGraphicsContextLostCallback* callback)
- OVERRIDE;
-
virtual void loseContextCHROMIUM(GLenum current,
GLenum other) OVERRIDE;
@@ -346,8 +347,7 @@ class TestWebGraphicsContext3D : public FakeWebGraphicsContext3D {
bool context_lost_;
int times_map_image_chromium_succeeds_;
int times_map_buffer_chromium_succeeds_;
- blink::WebGraphicsContext3D::WebGraphicsContextLostCallback*
- context_lost_callback_;
+ base::Closure context_lost_callback_;
base::hash_set<unsigned> used_textures_;
unsigned next_program_id_;
base::hash_set<unsigned> program_set_;