Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1584)

Unified Diff: cc/resources/raster_worker_pool_perftest.cc

Issue 141163019: Re-land: cc: Remove WorkerPool class and instead use TaskGraphRunner directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: build fix Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/resources/raster_worker_pool_perftest.cc
diff --git a/cc/resources/raster_worker_pool_perftest.cc b/cc/resources/raster_worker_pool_perftest.cc
index 8f2d7abd84b835d604cffd02de3285a24f48e3f2..d8df38acf1307f9c772d598151d73b489e3ebb1c 100644
--- a/cc/resources/raster_worker_pool_perftest.cc
+++ b/cc/resources/raster_worker_pool_perftest.cc
@@ -8,6 +8,7 @@
#include "cc/test/lap_timer.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/perf/perf_test.h"
+#include "third_party/khronos/GLES2/gl2.h"
namespace cc {
@@ -19,8 +20,10 @@ static const int kTimeCheckInterval = 10;
class PerfWorkerPoolTaskImpl : public internal::WorkerPoolTask {
public:
- // Overridden from internal::WorkerPoolTask:
+ // Overridden from internal::Task:
virtual void RunOnWorkerThread(unsigned thread_index) OVERRIDE {}
+
+ // Overridden from internal::WorkerPoolTask:
virtual void CompleteOnOriginThread() OVERRIDE {}
private:
@@ -40,7 +43,7 @@ class PerfRasterWorkerPool : public RasterWorkerPool {
virtual void ScheduleTasks(RasterTask::Queue* queue) OVERRIDE {
NOTREACHED();
}
- virtual GLenum GetResourceTarget() const OVERRIDE {
+ virtual unsigned GetResourceTarget() const OVERRIDE {
NOTREACHED();
return GL_TEXTURE_2D;
}

Powered by Google App Engine
This is Rietveld 408576698