summaryrefslogtreecommitdiffstats
path: root/cc/raster
diff options
context:
space:
mode:
authorreveman <reveman@chromium.org>2015-09-02 12:05:57 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-02 19:07:25 +0000
commitf4afae2839eb4c04bde4d2982d0194a6719b5eb5 (patch)
treede7ab3406494c4af04cf735bd4c3911777e0c278 /cc/raster
parent9a6e1deae7e8068cf9ddf0aa4c6e87a741ff622f (diff)
downloadchromium_src-f4afae2839eb4c04bde4d2982d0194a6719b5eb5.zip
chromium_src-f4afae2839eb4c04bde4d2982d0194a6719b5eb5.tar.gz
chromium_src-f4afae2839eb4c04bde4d2982d0194a6719b5eb5.tar.bz2
cc: Remove TileTask::RunReplyOnOriginThread.
No longer needed after removing async uploads. BUG=499372 R=vmpstr CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel Review URL: https://codereview.chromium.org/1321453010 Cr-Commit-Position: refs/heads/master@{#346986}
Diffstat (limited to 'cc/raster')
-rw-r--r--cc/raster/bitmap_tile_task_worker_pool.cc2
-rw-r--r--cc/raster/gpu_tile_task_worker_pool.cc2
-rw-r--r--cc/raster/one_copy_tile_task_worker_pool.cc2
-rw-r--r--cc/raster/tile_task_runner.h1
-rw-r--r--cc/raster/tile_task_worker_pool.cc1
-rw-r--r--cc/raster/tile_task_worker_pool_perftest.cc5
-rw-r--r--cc/raster/tile_task_worker_pool_unittest.cc5
-rw-r--r--cc/raster/zero_copy_tile_task_worker_pool.cc2
8 files changed, 2 insertions, 18 deletions
diff --git a/cc/raster/bitmap_tile_task_worker_pool.cc b/cc/raster/bitmap_tile_task_worker_pool.cc
index 6231225..8c6513b 100644
--- a/cc/raster/bitmap_tile_task_worker_pool.cc
+++ b/cc/raster/bitmap_tile_task_worker_pool.cc
@@ -175,8 +175,6 @@ void BitmapTileTaskWorkerPool::CheckForCompletedTasks() {
task->WillComplete();
task->CompleteOnOriginThread(this);
task->DidComplete();
-
- task->RunReplyOnOriginThread();
}
completed_tasks_.clear();
}
diff --git a/cc/raster/gpu_tile_task_worker_pool.cc b/cc/raster/gpu_tile_task_worker_pool.cc
index 2380455..0f3d607 100644
--- a/cc/raster/gpu_tile_task_worker_pool.cc
+++ b/cc/raster/gpu_tile_task_worker_pool.cc
@@ -217,8 +217,6 @@ void GpuTileTaskWorkerPool::CompleteTasks(const Task::Vector& tasks) {
tile_task->WillComplete();
tile_task->CompleteOnOriginThread(this);
tile_task->DidComplete();
-
- tile_task->RunReplyOnOriginThread();
}
completed_tasks_.clear();
}
diff --git a/cc/raster/one_copy_tile_task_worker_pool.cc b/cc/raster/one_copy_tile_task_worker_pool.cc
index 169fc36..b2f8c11 100644
--- a/cc/raster/one_copy_tile_task_worker_pool.cc
+++ b/cc/raster/one_copy_tile_task_worker_pool.cc
@@ -318,8 +318,6 @@ void OneCopyTileTaskWorkerPool::CheckForCompletedTasks() {
task->WillComplete();
task->CompleteOnOriginThread(this);
task->DidComplete();
-
- task->RunReplyOnOriginThread();
}
completed_tasks_.clear();
}
diff --git a/cc/raster/tile_task_runner.h b/cc/raster/tile_task_runner.h
index ae5d0b4..64c72f0 100644
--- a/cc/raster/tile_task_runner.h
+++ b/cc/raster/tile_task_runner.h
@@ -36,7 +36,6 @@ class CC_EXPORT TileTask : public Task {
virtual void ScheduleOnOriginThread(TileTaskClient* client) = 0;
virtual void CompleteOnOriginThread(TileTaskClient* client) = 0;
- virtual void RunReplyOnOriginThread() = 0;
void WillSchedule();
void DidSchedule();
diff --git a/cc/raster/tile_task_worker_pool.cc b/cc/raster/tile_task_worker_pool.cc
index e980c85..758962e 100644
--- a/cc/raster/tile_task_worker_pool.cc
+++ b/cc/raster/tile_task_worker_pool.cc
@@ -33,7 +33,6 @@ class TaskSetFinishedTaskImpl : public TileTask {
// Overridden from TileTask:
void ScheduleOnOriginThread(TileTaskClient* client) override {}
void CompleteOnOriginThread(TileTaskClient* client) override {}
- void RunReplyOnOriginThread() override {}
protected:
~TaskSetFinishedTaskImpl() override {}
diff --git a/cc/raster/tile_task_worker_pool_perftest.cc b/cc/raster/tile_task_worker_pool_perftest.cc
index b7d5e06..12b7464 100644
--- a/cc/raster/tile_task_worker_pool_perftest.cc
+++ b/cc/raster/tile_task_worker_pool_perftest.cc
@@ -132,8 +132,7 @@ class PerfImageDecodeTaskImpl : public ImageDecodeTask {
// Overridden from TileTask:
void ScheduleOnOriginThread(TileTaskClient* client) override {}
- void CompleteOnOriginThread(TileTaskClient* client) override {}
- void RunReplyOnOriginThread() override { Reset(); }
+ void CompleteOnOriginThread(TileTaskClient* client) override { Reset(); }
void Reset() {
did_run_ = false;
@@ -163,8 +162,8 @@ class PerfRasterTaskImpl : public RasterTask {
}
void CompleteOnOriginThread(TileTaskClient* client) override {
client->ReleaseBufferForRaster(raster_buffer_.Pass());
+ Reset();
}
- void RunReplyOnOriginThread() override { Reset(); }
void Reset() {
did_run_ = false;
diff --git a/cc/raster/tile_task_worker_pool_unittest.cc b/cc/raster/tile_task_worker_pool_unittest.cc
index 25ba989..d8e0d19 100644
--- a/cc/raster/tile_task_worker_pool_unittest.cc
+++ b/cc/raster/tile_task_worker_pool_unittest.cc
@@ -77,8 +77,6 @@ class TestRasterTaskImpl : public RasterTask {
}
void CompleteOnOriginThread(TileTaskClient* client) override {
client->ReleaseBufferForRaster(raster_buffer_.Pass());
- }
- void RunReplyOnOriginThread() override {
reply_.Run(RasterSource::SolidColorAnalysis(), !HasFinishedRunning());
}
@@ -108,9 +106,6 @@ class BlockingTestRasterTaskImpl : public TestRasterTaskImpl {
TestRasterTaskImpl::RunOnWorkerThread();
}
- // Overridden from TileTask:
- void RunReplyOnOriginThread() override {}
-
protected:
~BlockingTestRasterTaskImpl() override {}
diff --git a/cc/raster/zero_copy_tile_task_worker_pool.cc b/cc/raster/zero_copy_tile_task_worker_pool.cc
index 98ac447..2e3dca14 100644
--- a/cc/raster/zero_copy_tile_task_worker_pool.cc
+++ b/cc/raster/zero_copy_tile_task_worker_pool.cc
@@ -175,8 +175,6 @@ void ZeroCopyTileTaskWorkerPool::CheckForCompletedTasks() {
task->WillComplete();
task->CompleteOnOriginThread(this);
task->DidComplete();
-
- task->RunReplyOnOriginThread();
}
completed_tasks_.clear();
}