From 44b04f11e3de2fa689707bf925614f30693cd5d3 Mon Sep 17 00:00:00 2001 From: keishi Date: Tue, 4 Aug 2015 02:14:52 -0700 Subject: Revert of Implement and test task runners in RasterWorkerPool. (patchset #9 id:160001 of https://codereview.chromium.org/1254003003/ ) Reason for revert: Suspected of breaking Linux Tests (dbg) bot. RasterWorkerPool_SequencedTaskRunnerTest_0.SequentialNestable is failing. http://build.chromium.org/p/chromium.webkit/builders/Linux%20Tests%20%28dbg%29/builds/1246 Original issue's description: > Implement and test task runners in RasterWorkerPool. > > This CL moves RasterWorkerPool outside render_thread_impl.h and > in its own file, implements TaskRunner and SequencedTaskRunner > on top of it and properly tests the two implementations. > > BUG= > CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel > > Committed: https://crrev.com/37808ab81754acebe81aaa14c87ab328e77e2c46 > Cr-Commit-Position: refs/heads/master@{#341654} TBR=dalecurtis@chromium.org,piman@chromium.org,reveman@chromium.org,dcastagna@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= Review URL: https://codereview.chromium.org/1270093003 Cr-Commit-Position: refs/heads/master@{#341701} --- content/renderer/raster_worker_pool_unittest.cc | 71 ------------------------- 1 file changed, 71 deletions(-) delete mode 100644 content/renderer/raster_worker_pool_unittest.cc (limited to 'content/renderer/raster_worker_pool_unittest.cc') diff --git a/content/renderer/raster_worker_pool_unittest.cc b/content/renderer/raster_worker_pool_unittest.cc deleted file mode 100644 index 926ba2b..0000000 --- a/content/renderer/raster_worker_pool_unittest.cc +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "base/test/sequenced_task_runner_test_template.h" -#include "base/test/task_runner_test_template.h" -#include "base/threading/simple_thread.h" -#include "content/renderer/raster_worker_pool.h" - -namespace base { -namespace { - -// Number of threads spawned in tests. -const int kNumThreads = 4; - -class RasterWorkerPoolTestDelegate { - public: - RasterWorkerPoolTestDelegate() - : raster_worker_pool_(new content::RasterWorkerPool()) {} - - void StartTaskRunner() { - raster_worker_pool_->Start(kNumThreads, SimpleThread::Options()); - } - - scoped_refptr GetTaskRunner() { - return raster_worker_pool_; - } - - void StopTaskRunner() { - raster_worker_pool_->GetTaskGraphRunner()->FlushForTesting(); - } - - ~RasterWorkerPoolTestDelegate() { raster_worker_pool_->Shutdown(); } - - private: - scoped_refptr raster_worker_pool_; -}; - -INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool, - TaskRunnerTest, - RasterWorkerPoolTestDelegate); - -class RasterWorkerPoolSequencedTestDelegate { - public: - RasterWorkerPoolSequencedTestDelegate() - : raster_worker_pool_(new content::RasterWorkerPool()) {} - - void StartTaskRunner() { - raster_worker_pool_->Start(kNumThreads, SimpleThread::Options()); - } - - scoped_refptr GetTaskRunner() { - return raster_worker_pool_->CreateSequencedTaskRunner(); - } - - void StopTaskRunner() { - raster_worker_pool_->GetTaskGraphRunner()->FlushForTesting(); - } - - ~RasterWorkerPoolSequencedTestDelegate() { raster_worker_pool_->Shutdown(); } - - private: - scoped_refptr raster_worker_pool_; -}; - -INSTANTIATE_TYPED_TEST_CASE_P(RasterWorkerPool, - SequencedTaskRunnerTest, - RasterWorkerPoolSequencedTestDelegate); - -} // namespace -} // namespace base -- cgit v1.1