From d0ae42e25411518364942eeaef32badf1bbd087e Mon Sep 17 00:00:00 2001 From: "jamesr@chromium.org" Date: Wed, 15 Jan 2014 19:15:07 +0000 Subject: 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 --- cc/test/test_web_graphics_context_3d.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to '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 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 +#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 used_textures_; unsigned next_program_id_; base::hash_set program_set_; -- cgit v1.1