summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authordcastagna <dcastagna@chromium.org>2015-10-22 14:19:19 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-22 21:19:54 +0000
commit65ee4346123cb72b9860408dee37c51886281730 (patch)
treecceb976e3932d73ecd0b9c9106487094ed37c942 /cc
parent5785b8666746999cacd8262387fbb699aa69d996 (diff)
downloadchromium_src-65ee4346123cb72b9860408dee37c51886281730.zip
chromium_src-65ee4346123cb72b9860408dee37c51886281730.tar.gz
chromium_src-65ee4346123cb72b9860408dee37c51886281730.tar.bz2
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}
Diffstat (limited to 'cc')
-rw-r--r--cc/output/context_provider.h8
-rw-r--r--cc/raster/tile_task_worker_pool_perftest.cc1
-rw-r--r--cc/test/test_context_provider.cc5
-rw-r--r--cc/test/test_context_provider.h1
-rw-r--r--cc/test/test_in_process_context_provider.cc2
-rw-r--r--cc/test/test_in_process_context_provider.h1
6 files changed, 1 insertions, 17 deletions
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<ContextProvider> {
// 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;