From 65ee4346123cb72b9860408dee37c51886281730 Mon Sep 17 00:00:00 2001 From: dcastagna Date: Thu, 22 Oct 2015 14:19:19 -0700 Subject: Remove ContextProvider::VerifyContexts. ContextProvider::VerifyContexts is not used anywhere. BUG=544547 CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1419923002 Cr-Commit-Position: refs/heads/master@{#355643} --- cc/output/context_provider.h | 8 +------- cc/raster/tile_task_worker_pool_perftest.cc | 1 - cc/test/test_context_provider.cc | 5 ----- cc/test/test_context_provider.h | 1 - cc/test/test_in_process_context_provider.cc | 2 -- cc/test/test_in_process_context_provider.h | 1 - 6 files changed, 1 insertion(+), 17 deletions(-) (limited to 'cc') diff --git a/cc/output/context_provider.h b/cc/output/context_provider.h index e1a4431..db12706 100644 --- a/cc/output/context_provider.h +++ b/cc/output/context_provider.h @@ -84,18 +84,12 @@ class ContextProvider : public base::RefCountedThreadSafe { // Returns the capabilities of the currently bound 3d context. virtual Capabilities ContextCapabilities() = 0; - // Ask the provider to check if the contexts are valid or lost. If they are, - // this should invalidate the provider so that it can be replaced with a new - // one. - virtual void VerifyContexts() = 0; - // Delete all cached gpu resources. virtual void DeleteCachedResources() = 0; // Sets a callback to be called when the context is lost. This should be // called from the same thread that the context is bound to. To avoid races, - // it should be called before BindToCurrentThread(), or VerifyContexts() - // should be called after setting the callback. + // it should be called before BindToCurrentThread(). typedef base::Closure LostContextCallback; virtual void SetLostContextCallback( const LostContextCallback& lost_context_callback) = 0; diff --git a/cc/raster/tile_task_worker_pool_perftest.cc b/cc/raster/tile_task_worker_pool_perftest.cc index 1c4942c..a67f6b0 100644 --- a/cc/raster/tile_task_worker_pool_perftest.cc +++ b/cc/raster/tile_task_worker_pool_perftest.cc @@ -96,7 +96,6 @@ class PerfContextProvider : public ContextProvider { } void SetupLock() override {} base::Lock* GetLock() override { return &context_lock_; } - void VerifyContexts() override {} void DeleteCachedResources() override {} void SetLostContextCallback(const LostContextCallback& cb) override {} diff --git a/cc/test/test_context_provider.cc b/cc/test/test_context_provider.cc index f702165..0c45e62 100644 --- a/cc/test/test_context_provider.cc +++ b/cc/test/test_context_provider.cc @@ -137,11 +137,6 @@ base::Lock* TestContextProvider::GetLock() { return &context_lock_; } -void TestContextProvider::VerifyContexts() { - DCHECK(bound_); - DCHECK(context_thread_checker_.CalledOnValidThread()); -} - void TestContextProvider::DeleteCachedResources() { } diff --git a/cc/test/test_context_provider.h b/cc/test/test_context_provider.h index fc98873..1b7a915 100644 --- a/cc/test/test_context_provider.h +++ b/cc/test/test_context_provider.h @@ -40,7 +40,6 @@ class TestContextProvider : public ContextProvider { void InvalidateGrContext(uint32_t state) override; void SetupLock() override; base::Lock* GetLock() override; - void VerifyContexts() override; void DeleteCachedResources() override; void SetLostContextCallback(const LostContextCallback& cb) override; diff --git a/cc/test/test_in_process_context_provider.cc b/cc/test/test_in_process_context_provider.cc index d5b7c28..02c23af 100644 --- a/cc/test/test_in_process_context_provider.cc +++ b/cc/test/test_in_process_context_provider.cc @@ -156,8 +156,6 @@ TestInProcessContextProvider::ContextCapabilities() { return capabilities; } -void TestInProcessContextProvider::VerifyContexts() {} - void TestInProcessContextProvider::DeleteCachedResources() { if (gr_context_) gr_context_->freeGpuResources(); diff --git a/cc/test/test_in_process_context_provider.h b/cc/test/test_in_process_context_provider.h index 91fe8fd9..904ac6d 100644 --- a/cc/test/test_in_process_context_provider.h +++ b/cc/test/test_in_process_context_provider.h @@ -36,7 +36,6 @@ class TestInProcessContextProvider : public ContextProvider { void SetupLock() override; base::Lock* GetLock() override; Capabilities ContextCapabilities() override; - void VerifyContexts() override; void DeleteCachedResources() override; void SetLostContextCallback( const LostContextCallback& lost_context_callback) override; -- cgit v1.1