#include <limits>
#include <vector>
+#include "base/cancelable_callback.h"
+#include "cc/resources/gpu_raster_worker_pool.h"
+#include "cc/resources/image_copy_raster_worker_pool.h"
#include "cc/resources/image_raster_worker_pool.h"
#include "cc/resources/picture_pile.h"
#include "cc/resources/picture_pile_impl.h"
#include "cc/resources/pixel_buffer_raster_worker_pool.h"
+#include "cc/resources/rasterizer.h"
+#include "cc/resources/resource_pool.h"
#include "cc/resources/resource_provider.h"
#include "cc/resources/scoped_resource.h"
#include "cc/test/fake_output_surface.h"
#include "cc/test/fake_output_surface_client.h"
+#include "cc/test/test_shared_bitmap_manager.h"
#include "cc/test/test_web_graphics_context_3d.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace cc {
+namespace {
+
+enum RasterWorkerPoolType {
+ RASTER_WORKER_POOL_TYPE_PIXEL_BUFFER,
+ RASTER_WORKER_POOL_TYPE_IMAGE,
+ RASTER_WORKER_POOL_TYPE_IMAGE_COPY,
+ RASTER_WORKER_POOL_TYPE_GPU
+};
-class TestRasterWorkerPoolTaskImpl : public internal::RasterWorkerPoolTask {
+class TestRasterTaskImpl : public RasterTask {
public:
- typedef base::Callback<void(const PicturePileImpl::Analysis& analysis,
- bool was_canceled,
- bool did_raster)> Reply;
-
- TestRasterWorkerPoolTaskImpl(
- const Resource* resource,
- const Reply& reply,
- TaskVector* dependencies)
- : internal::RasterWorkerPoolTask(resource, dependencies),
- reply_(reply),
- did_raster_(false) {}
-
- // Overridden from internal::WorkerPoolTask:
- virtual bool RunOnWorkerThread(unsigned thread_index,
- void* buffer,
- gfx::Size size,
- int stride) OVERRIDE {
- did_raster_ = true;
- return true;
+ typedef base::Callback<
+ void(const PicturePileImpl::Analysis& analysis, bool was_canceled)> Reply;
+
+ TestRasterTaskImpl(const Resource* resource,
+ const Reply& reply,
+ ImageDecodeTask::Vector* dependencies)
+ : RasterTask(resource, dependencies), reply_(reply) {}
+
+ // Overridden from Task:
+ virtual void RunOnWorkerThread() OVERRIDE {}
+
+ // Overridden from RasterizerTask:
+ virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) OVERRIDE {
+ client->AcquireCanvasForRaster(this);
+ }
+ virtual void CompleteOnOriginThread(RasterizerTaskClient* client) OVERRIDE {
+ client->ReleaseCanvasForRaster(this);
}
- virtual void CompleteOnOriginThread() OVERRIDE {
- reply_.Run(PicturePileImpl::Analysis(), !HasFinishedRunning(), did_raster_);
+ virtual void RunReplyOnOriginThread() OVERRIDE {
+ reply_.Run(PicturePileImpl::Analysis(), !HasFinishedRunning());
}
protected:
- virtual ~TestRasterWorkerPoolTaskImpl() {}
+ virtual ~TestRasterTaskImpl() {}
private:
const Reply reply_;
- bool did_raster_;
- DISALLOW_COPY_AND_ASSIGN(TestRasterWorkerPoolTaskImpl);
+ DISALLOW_COPY_AND_ASSIGN(TestRasterTaskImpl);
+};
+
+class BlockingTestRasterTaskImpl : public TestRasterTaskImpl {
+ public:
+ BlockingTestRasterTaskImpl(const Resource* resource,
+ const Reply& reply,
+ base::Lock* lock,
+ ImageDecodeTask::Vector* dependencies)
+ : TestRasterTaskImpl(resource, reply, dependencies), lock_(lock) {}
+
+ // Overridden from Task:
+ virtual void RunOnWorkerThread() OVERRIDE {
+ base::AutoLock lock(*lock_);
+ TestRasterTaskImpl::RunOnWorkerThread();
+ }
+
+ // Overridden from RasterizerTask:
+ virtual void RunReplyOnOriginThread() OVERRIDE {}
+
+ protected:
+ virtual ~BlockingTestRasterTaskImpl() {}
+
+ private:
+ base::Lock* lock_;
+
+ DISALLOW_COPY_AND_ASSIGN(BlockingTestRasterTaskImpl);
};
-class RasterWorkerPoolTest : public testing::Test,
- public RasterWorkerPoolClient {
+class RasterWorkerPoolTest
+ : public testing::TestWithParam<RasterWorkerPoolType>,
+ public RasterizerClient {
public:
+ struct RasterTaskResult {
+ unsigned id;
+ bool canceled;
+ };
+
+ typedef std::vector<scoped_refptr<RasterTask> > RasterTaskVector;
+
RasterWorkerPoolTest()
: context_provider_(TestContextProvider::Create()),
- check_interval_milliseconds_(1),
timeout_seconds_(5),
timed_out_(false) {
output_surface_ = FakeOutputSurface::Create3d(context_provider_).Pass();
CHECK(output_surface_->BindToClient(&output_surface_client_));
- resource_provider_ = ResourceProvider::Create(
- output_surface_.get(), NULL, 0, false, 1).Pass();
+ shared_bitmap_manager_.reset(new TestSharedBitmapManager());
+ resource_provider_ =
+ ResourceProvider::Create(
+ output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1,
+ false).Pass();
+ staging_resource_pool_ = ResourcePool::Create(
+ resource_provider_.get(), GL_TEXTURE_2D, RGBA_8888);
+
+ switch (GetParam()) {
+ case RASTER_WORKER_POOL_TYPE_PIXEL_BUFFER:
+ raster_worker_pool_ = PixelBufferRasterWorkerPool::Create(
+ base::MessageLoopProxy::current().get(),
+ RasterWorkerPool::GetTaskGraphRunner(),
+ context_provider_.get(),
+ resource_provider_.get(),
+ std::numeric_limits<size_t>::max());
+ break;
+ case RASTER_WORKER_POOL_TYPE_IMAGE:
+ raster_worker_pool_ = ImageRasterWorkerPool::Create(
+ base::MessageLoopProxy::current().get(),
+ RasterWorkerPool::GetTaskGraphRunner(),
+ resource_provider_.get());
+ break;
+ case RASTER_WORKER_POOL_TYPE_IMAGE_COPY:
+ raster_worker_pool_ = ImageCopyRasterWorkerPool::Create(
+ base::MessageLoopProxy::current().get(),
+ RasterWorkerPool::GetTaskGraphRunner(),
+ context_provider_.get(),
+ resource_provider_.get(),
+ staging_resource_pool_.get());
+ break;
+ case RASTER_WORKER_POOL_TYPE_GPU:
+ raster_worker_pool_ =
+ GpuRasterWorkerPool::Create(base::MessageLoopProxy::current().get(),
+ context_provider_.get(),
+ resource_provider_.get());
+ break;
+ }
+
+ DCHECK(raster_worker_pool_);
+ raster_worker_pool_->AsRasterizer()->SetClient(this);
}
virtual ~RasterWorkerPoolTest() {
+ staging_resource_pool_.reset();
resource_provider_.reset();
}
// Overridden from testing::Test:
virtual void TearDown() OVERRIDE {
- if (!raster_worker_pool_)
- return;
- raster_worker_pool_->Shutdown();
- raster_worker_pool_->CheckForCompletedTasks();
+ raster_worker_pool_->AsRasterizer()->Shutdown();
+ raster_worker_pool_->AsRasterizer()->CheckForCompletedTasks();
}
// Overriden from RasterWorkerPoolClient:
OVERRIDE {
return false;
}
- virtual void DidFinishRunningTasks() OVERRIDE {}
- virtual void DidFinishRunningTasksRequiredForActivation() OVERRIDE {}
-
- virtual void BeginTest() = 0;
- virtual void AfterTest() = 0;
-
- ResourceProvider* resource_provider() const {
- return resource_provider_.get();
- }
-
- RasterWorkerPool* worker_pool() {
- return raster_worker_pool_.get();
+ virtual void DidFinishRunningTasks() OVERRIDE {
+ raster_worker_pool_->AsRasterizer()->CheckForCompletedTasks();
+ base::MessageLoop::current()->Quit();
}
+ virtual void DidFinishRunningTasksRequiredForActivation() OVERRIDE {}
- void RunTest(bool use_map_image) {
- if (use_map_image) {
- raster_worker_pool_ = ImageRasterWorkerPool::Create(
- resource_provider(), 1);
- } else {
- raster_worker_pool_ =
- PixelBufferRasterWorkerPool::Create(
- resource_provider(),
- 1,
- std::numeric_limits<size_t>::max());
- }
-
- raster_worker_pool_->SetClient(this);
-
- BeginTest();
-
- ScheduleCheckForCompletedTasks();
-
+ void RunMessageLoopUntilAllTasksHaveCompleted() {
if (timeout_seconds_) {
- timeout_.Reset(base::Bind(&RasterWorkerPoolTest::OnTimeout,
- base::Unretained(this)));
+ timeout_.Reset(
+ base::Bind(&RasterWorkerPoolTest::OnTimeout, base::Unretained(this)));
base::MessageLoopProxy::current()->PostDelayedTask(
FROM_HERE,
timeout_.callback(),
base::MessageLoop::current()->Run();
- check_.Cancel();
timeout_.Cancel();
- if (timed_out_) {
- FAIL() << "Test timed out";
- return;
- }
- AfterTest();
- }
-
- void EndTest() {
- base::MessageLoop::current()->Quit();
+ ASSERT_FALSE(timed_out_) << "Test timed out";
}
void ScheduleTasks() {
- RasterWorkerPool::RasterTask::Queue tasks;
+ RasterTaskQueue queue;
- for (std::vector<RasterWorkerPool::RasterTask>::iterator it =
- tasks_.begin();
- it != tasks_.end(); ++it)
- tasks.Append(*it, false);
+ for (RasterTaskVector::const_iterator it = tasks_.begin();
+ it != tasks_.end();
+ ++it)
+ queue.items.push_back(RasterTaskQueue::Item(*it, false));
- worker_pool()->ScheduleTasks(&tasks);
+ raster_worker_pool_->AsRasterizer()->ScheduleTasks(&queue);
}
void AppendTask(unsigned id) {
const gfx::Size size(1, 1);
scoped_ptr<ScopedResource> resource(
- ScopedResource::create(resource_provider()));
+ ScopedResource::Create(resource_provider_.get()));
resource->Allocate(size, ResourceProvider::TextureUsageAny, RGBA_8888);
const Resource* const_resource = resource.get();
- RasterWorkerPool::Task::Set empty;
- tasks_.push_back(
- RasterWorkerPool::RasterTask(new TestRasterWorkerPoolTaskImpl(
- const_resource,
- base::Bind(&RasterWorkerPoolTest::OnTaskCompleted,
- base::Unretained(this),
- base::Passed(&resource),
- id),
- &empty.tasks_)));
+ ImageDecodeTask::Vector empty;
+ tasks_.push_back(new TestRasterTaskImpl(
+ const_resource,
+ base::Bind(&RasterWorkerPoolTest::OnTaskCompleted,
+ base::Unretained(this),
+ base::Passed(&resource),
+ id),
+ &empty));
}
- virtual void OnTaskCompleted(scoped_ptr<ScopedResource> resource,
- unsigned id,
- const PicturePileImpl::Analysis& analysis,
- bool was_canceled,
- bool did_raster) {}
+ void AppendBlockingTask(unsigned id, base::Lock* lock) {
+ const gfx::Size size(1, 1);
- private:
- void ScheduleCheckForCompletedTasks() {
- check_.Reset(base::Bind(&RasterWorkerPoolTest::OnCheckForCompletedTasks,
- base::Unretained(this)));
- base::MessageLoopProxy::current()->PostDelayedTask(
- FROM_HERE,
- check_.callback(),
- base::TimeDelta::FromMilliseconds(check_interval_milliseconds_));
+ scoped_ptr<ScopedResource> resource(
+ ScopedResource::Create(resource_provider_.get()));
+ resource->Allocate(size, ResourceProvider::TextureUsageAny, RGBA_8888);
+ const Resource* const_resource = resource.get();
+
+ ImageDecodeTask::Vector empty;
+ tasks_.push_back(new BlockingTestRasterTaskImpl(
+ const_resource,
+ base::Bind(&RasterWorkerPoolTest::OnTaskCompleted,
+ base::Unretained(this),
+ base::Passed(&resource),
+ id),
+ lock,
+ &empty));
+ }
+
+ const std::vector<RasterTaskResult>& completed_tasks() const {
+ return completed_tasks_;
}
- void OnCheckForCompletedTasks() {
- raster_worker_pool_->CheckForCompletedTasks();
- ScheduleCheckForCompletedTasks();
+ private:
+ void OnTaskCompleted(scoped_ptr<ScopedResource> resource,
+ unsigned id,
+ const PicturePileImpl::Analysis& analysis,
+ bool was_canceled) {
+ RasterTaskResult result;
+ result.id = id;
+ result.canceled = was_canceled;
+ completed_tasks_.push_back(result);
}
void OnTimeout() {
scoped_refptr<TestContextProvider> context_provider_;
FakeOutputSurfaceClient output_surface_client_;
scoped_ptr<FakeOutputSurface> output_surface_;
+ scoped_ptr<SharedBitmapManager> shared_bitmap_manager_;
scoped_ptr<ResourceProvider> resource_provider_;
+ scoped_ptr<ResourcePool> staging_resource_pool_;
scoped_ptr<RasterWorkerPool> raster_worker_pool_;
- base::CancelableClosure check_;
- int check_interval_milliseconds_;
base::CancelableClosure timeout_;
int timeout_seconds_;
bool timed_out_;
- std::vector<RasterWorkerPool::RasterTask> tasks_;
+ RasterTaskVector tasks_;
+ std::vector<RasterTaskResult> completed_tasks_;
};
-namespace {
-
-#define PIXEL_BUFFER_TEST_F(TEST_FIXTURE_NAME) \
- TEST_F(TEST_FIXTURE_NAME, RunPixelBuffer) { \
- RunTest(false); \
- }
-
-#define IMAGE_TEST_F(TEST_FIXTURE_NAME) \
- TEST_F(TEST_FIXTURE_NAME, RunImage) { \
- RunTest(true); \
- }
-
-#define PIXEL_BUFFER_AND_IMAGE_TEST_F(TEST_FIXTURE_NAME) \
- PIXEL_BUFFER_TEST_F(TEST_FIXTURE_NAME); \
- IMAGE_TEST_F(TEST_FIXTURE_NAME)
-
-class BasicRasterWorkerPoolTest : public RasterWorkerPoolTest {
- public:
- virtual void OnTaskCompleted(scoped_ptr<ScopedResource> resource,
- unsigned id,
- const PicturePileImpl::Analysis& analysis,
- bool was_canceled,
- bool did_raster) OVERRIDE {
- EXPECT_TRUE(did_raster);
- on_task_completed_ids_.push_back(id);
- if (on_task_completed_ids_.size() == 2)
- EndTest();
- }
-
- // Overridden from RasterWorkerPoolTest:
- virtual void BeginTest() OVERRIDE {
- AppendTask(0u);
- AppendTask(1u);
- ScheduleTasks();
- }
- virtual void AfterTest() OVERRIDE {
- EXPECT_EQ(2u, on_task_completed_ids_.size());
- tasks_.clear();
- }
-
- std::vector<unsigned> on_task_completed_ids_;
-};
-
-PIXEL_BUFFER_AND_IMAGE_TEST_F(BasicRasterWorkerPoolTest);
-
-class RasterWorkerPoolTestFailedMapResource : public RasterWorkerPoolTest {
- public:
- virtual void OnTaskCompleted(scoped_ptr<ScopedResource> resource,
- unsigned id,
- const PicturePileImpl::Analysis& analysis,
- bool was_canceled,
- bool did_raster) OVERRIDE {
- EXPECT_FALSE(did_raster);
- EndTest();
- }
-
- // Overridden from RasterWorkerPoolTest:
- virtual void BeginTest() OVERRIDE {
- TestWebGraphicsContext3D* context3d = context_provider_->TestContext3d();
- context3d->set_times_map_image_chromium_succeeds(0);
- context3d->set_times_map_buffer_chromium_succeeds(0);
- AppendTask(0u);
- ScheduleTasks();
- }
-
- virtual void AfterTest() OVERRIDE {
- ASSERT_EQ(1u, tasks_.size());
- tasks_.clear();
- }
-};
-
-PIXEL_BUFFER_AND_IMAGE_TEST_F(RasterWorkerPoolTestFailedMapResource);
+TEST_P(RasterWorkerPoolTest, Basic) {
+ AppendTask(0u);
+ AppendTask(1u);
+ ScheduleTasks();
+
+ RunMessageLoopUntilAllTasksHaveCompleted();
+
+ ASSERT_EQ(2u, completed_tasks().size());
+ EXPECT_FALSE(completed_tasks()[0].canceled);
+ EXPECT_FALSE(completed_tasks()[1].canceled);
+}
+
+TEST_P(RasterWorkerPoolTest, FailedMapResource) {
+ TestWebGraphicsContext3D* context3d = context_provider_->TestContext3d();
+ context3d->set_times_map_image_chromium_succeeds(0);
+ context3d->set_times_map_buffer_chromium_succeeds(0);
+ AppendTask(0u);
+ ScheduleTasks();
+
+ RunMessageLoopUntilAllTasksHaveCompleted();
+
+ ASSERT_EQ(1u, completed_tasks().size());
+ EXPECT_FALSE(completed_tasks()[0].canceled);
+}
+
+// This test checks that replacing a pending raster task with another does
+// not prevent the DidFinishRunningTasks notification from being sent.
+TEST_P(RasterWorkerPoolTest, FalseThrottling) {
+ base::Lock lock;
+
+ // Schedule a task that is prevented from completing with a lock.
+ lock.Acquire();
+ AppendBlockingTask(0u, &lock);
+ ScheduleTasks();
+
+ // Schedule another task to replace the still-pending task. Because the old
+ // task is not a throttled task in the new task set, it should not prevent
+ // DidFinishRunningTasks from getting signaled.
+ RasterTaskVector tasks;
+ tasks.swap(tasks_);
+ AppendTask(1u);
+ ScheduleTasks();
+
+ // Unblock the first task to allow the second task to complete.
+ lock.Release();
+
+ RunMessageLoopUntilAllTasksHaveCompleted();
+}
+
+INSTANTIATE_TEST_CASE_P(RasterWorkerPoolTests,
+ RasterWorkerPoolTest,
+ ::testing::Values(RASTER_WORKER_POOL_TYPE_PIXEL_BUFFER,
+ RASTER_WORKER_POOL_TYPE_IMAGE,
+ RASTER_WORKER_POOL_TYPE_IMAGE_COPY,
+ RASTER_WORKER_POOL_TYPE_GPU));
} // namespace
-
} // namespace cc
projects / platform / framework / web / crosswalk.git / blobdiff