#include <vector>
#include "base/cancelable_callback.h"
-#include "cc/resources/direct_raster_worker_pool.h"
-#include "cc/resources/image_raster_worker_pool.h"
+#include "cc/resources/bitmap_raster_worker_pool.h"
+#include "cc/resources/gpu_raster_worker_pool.h"
+#include "cc/resources/one_copy_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/raster_buffer.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/resources/zero_copy_raster_worker_pool.h"
#include "cc/test/fake_output_surface.h"
#include "cc/test/fake_output_surface_client.h"
+#include "cc/test/fake_picture_pile_impl.h"
+#include "cc/test/test_gpu_memory_buffer_manager.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 RasterThread {
- RASTER_THREAD_NONE,
- RASTER_THREAD_ORIGIN,
- RASTER_THREAD_WORKER
-};
+const size_t kMaxTransferBufferUsageBytes = 10000U;
+// A resource of this dimension^2 * 4 must be greater than the above transfer
+// buffer constant.
+const size_t kLargeResourceDimension = 1000U;
enum RasterWorkerPoolType {
RASTER_WORKER_POOL_TYPE_PIXEL_BUFFER,
- RASTER_WORKER_POOL_TYPE_IMAGE,
- RASTER_WORKER_POOL_TYPE_DIRECT
+ RASTER_WORKER_POOL_TYPE_ZERO_COPY,
+ RASTER_WORKER_POOL_TYPE_ONE_COPY,
+ RASTER_WORKER_POOL_TYPE_GPU,
+ RASTER_WORKER_POOL_TYPE_BITMAP
};
-class TestRasterWorkerPoolTaskImpl : public internal::RasterWorkerPoolTask {
+class TestRasterTaskImpl : public RasterTask {
public:
- typedef base::Callback<void(const PicturePileImpl::Analysis& analysis,
- bool was_canceled,
- RasterThread raster_thread)> Reply;
-
- TestRasterWorkerPoolTaskImpl(const Resource* resource,
- const Reply& reply,
- internal::WorkerPoolTask::Vector* dependencies)
- : internal::RasterWorkerPoolTask(resource, dependencies),
+ typedef base::Callback<void(const RasterSource::SolidColorAnalysis& analysis,
+ bool was_canceled)> Reply;
+
+ TestRasterTaskImpl(const Resource* resource,
+ const Reply& reply,
+ ImageDecodeTask::Vector* dependencies)
+ : RasterTask(resource, dependencies),
reply_(reply),
- raster_thread_(RASTER_THREAD_NONE) {}
+ picture_pile_(FakePicturePileImpl::CreateEmptyPile(gfx::Size(1, 1),
+ gfx::Size(1, 1))) {}
- // Overridden from internal::Task:
- virtual void RunOnWorkerThread() OVERRIDE {
- raster_thread_ = RASTER_THREAD_WORKER;
+ // Overridden from Task:
+ void RunOnWorkerThread() override {
+ raster_buffer_->Playback(picture_pile_.get(), gfx::Rect(0, 0, 1, 1), 1.0);
}
- // Overridden from internal::WorkerPoolTask:
- virtual void ScheduleOnOriginThread(internal::WorkerPoolTaskClient* client)
- OVERRIDE {
- client->AcquireCanvasForRaster(this, resource());
- }
- virtual void RunOnOriginThread() OVERRIDE {
- raster_thread_ = RASTER_THREAD_ORIGIN;
+ // Overridden from RasterizerTask:
+ void ScheduleOnOriginThread(RasterizerTaskClient* client) override {
+ raster_buffer_ = client->AcquireBufferForRaster(resource());
}
- virtual void CompleteOnOriginThread(internal::WorkerPoolTaskClient* client)
- OVERRIDE {
- client->ReleaseCanvasForRaster(this, resource());
+ void CompleteOnOriginThread(RasterizerTaskClient* client) override {
+ client->ReleaseBufferForRaster(raster_buffer_.Pass());
}
- virtual void RunReplyOnOriginThread() OVERRIDE {
- reply_.Run(
- PicturePileImpl::Analysis(), !HasFinishedRunning(), raster_thread_);
+ void RunReplyOnOriginThread() override {
+ reply_.Run(RasterSource::SolidColorAnalysis(), !HasFinishedRunning());
}
protected:
- virtual ~TestRasterWorkerPoolTaskImpl() {}
+ ~TestRasterTaskImpl() override {}
private:
const Reply reply_;
- RasterThread raster_thread_;
+ scoped_ptr<RasterBuffer> raster_buffer_;
+ scoped_refptr<PicturePileImpl> picture_pile_;
- DISALLOW_COPY_AND_ASSIGN(TestRasterWorkerPoolTaskImpl);
+ DISALLOW_COPY_AND_ASSIGN(TestRasterTaskImpl);
};
-class BlockingTestRasterWorkerPoolTaskImpl
- : public TestRasterWorkerPoolTaskImpl {
+class BlockingTestRasterTaskImpl : public TestRasterTaskImpl {
public:
- BlockingTestRasterWorkerPoolTaskImpl(
- const Resource* resource,
- const Reply& reply,
- base::Lock* lock,
- internal::WorkerPoolTask::Vector* dependencies)
- : TestRasterWorkerPoolTaskImpl(resource, reply, dependencies),
- lock_(lock) {}
-
- // Overridden from internal::Task:
- virtual void RunOnWorkerThread() OVERRIDE {
+ BlockingTestRasterTaskImpl(const Resource* resource,
+ const Reply& reply,
+ base::Lock* lock,
+ ImageDecodeTask::Vector* dependencies)
+ : TestRasterTaskImpl(resource, reply, dependencies), lock_(lock) {}
+
+ // Overridden from Task:
+ void RunOnWorkerThread() override {
base::AutoLock lock(*lock_);
- TestRasterWorkerPoolTaskImpl::RunOnWorkerThread();
+ TestRasterTaskImpl::RunOnWorkerThread();
}
- // Overridden from internal::WorkerPoolTask:
- virtual void RunReplyOnOriginThread() OVERRIDE {}
+ // Overridden from RasterizerTask:
+ void RunReplyOnOriginThread() override {}
protected:
- virtual ~BlockingTestRasterWorkerPoolTaskImpl() {}
+ ~BlockingTestRasterTaskImpl() override {}
private:
base::Lock* lock_;
- DISALLOW_COPY_AND_ASSIGN(BlockingTestRasterWorkerPoolTaskImpl);
+ DISALLOW_COPY_AND_ASSIGN(BlockingTestRasterTaskImpl);
};
class RasterWorkerPoolTest
: public testing::TestWithParam<RasterWorkerPoolType>,
- public RasterWorkerPoolClient {
+ public RasterizerClient {
public:
struct RasterTaskResult {
unsigned id;
bool canceled;
- RasterThread raster_thread;
};
- typedef std::vector<scoped_refptr<internal::RasterWorkerPoolTask> >
- RasterTaskVector;
+ typedef std::vector<scoped_refptr<RasterTask>> RasterTaskVector;
+
+ enum NamedTaskSet { REQUIRED_FOR_ACTIVATION = 0, ALL = 1 };
RasterWorkerPoolTest()
: context_provider_(TestContextProvider::Create()),
timeout_seconds_(5),
- timed_out_(false) {
- output_surface_ = FakeOutputSurface::Create3d(context_provider_).Pass();
- CHECK(output_surface_->BindToClient(&output_surface_client_));
-
- shared_bitmap_manager_.reset(new TestSharedBitmapManager());
- resource_provider_ =
- ResourceProvider::Create(
- output_surface_.get(), shared_bitmap_manager_.get(), 0, false, 1)
- .Pass();
+ timed_out_(false) {}
+ // Overridden from testing::Test:
+ virtual void SetUp() override {
switch (GetParam()) {
case RASTER_WORKER_POOL_TYPE_PIXEL_BUFFER:
+ Create3dOutputSurfaceAndResourceProvider();
raster_worker_pool_ = PixelBufferRasterWorkerPool::Create(
base::MessageLoopProxy::current().get(),
+ RasterWorkerPool::GetTaskGraphRunner(),
+ context_provider_.get(),
resource_provider_.get(),
- std::numeric_limits<size_t>::max());
+ kMaxTransferBufferUsageBytes);
break;
- case RASTER_WORKER_POOL_TYPE_IMAGE:
- raster_worker_pool_ = ImageRasterWorkerPool::Create(
+ case RASTER_WORKER_POOL_TYPE_ZERO_COPY:
+ Create3dOutputSurfaceAndResourceProvider();
+ raster_worker_pool_ = ZeroCopyRasterWorkerPool::Create(
base::MessageLoopProxy::current().get(),
- resource_provider_.get(),
- GL_TEXTURE_2D);
+ RasterWorkerPool::GetTaskGraphRunner(),
+ resource_provider_.get());
break;
- case RASTER_WORKER_POOL_TYPE_DIRECT:
- raster_worker_pool_ = DirectRasterWorkerPool::Create(
+ case RASTER_WORKER_POOL_TYPE_ONE_COPY:
+ Create3dOutputSurfaceAndResourceProvider();
+ staging_resource_pool_ = ResourcePool::Create(
+ resource_provider_.get(), GL_TEXTURE_2D, RGBA_8888);
+ raster_worker_pool_ = OneCopyRasterWorkerPool::Create(
base::MessageLoopProxy::current().get(),
+ RasterWorkerPool::GetTaskGraphRunner(),
+ context_provider_.get(),
resource_provider_.get(),
- context_provider_.get());
+ staging_resource_pool_.get());
+ break;
+ case RASTER_WORKER_POOL_TYPE_GPU:
+ Create3dOutputSurfaceAndResourceProvider();
+ raster_worker_pool_ =
+ GpuRasterWorkerPool::Create(base::MessageLoopProxy::current().get(),
+ context_provider_.get(),
+ resource_provider_.get(),
+ false);
+ break;
+ case RASTER_WORKER_POOL_TYPE_BITMAP:
+ CreateSoftwareOutputSurfaceAndResourceProvider();
+ raster_worker_pool_ = BitmapRasterWorkerPool::Create(
+ base::MessageLoopProxy::current().get(),
+ RasterWorkerPool::GetTaskGraphRunner(),
+ resource_provider_.get());
break;
}
DCHECK(raster_worker_pool_);
- raster_worker_pool_->SetClient(this);
+ raster_worker_pool_->AsRasterizer()->SetClient(this);
}
- virtual ~RasterWorkerPoolTest() { resource_provider_.reset(); }
- // Overridden from testing::Test:
- virtual void TearDown() OVERRIDE {
- raster_worker_pool_->Shutdown();
- raster_worker_pool_->CheckForCompletedTasks();
+ virtual void TearDown() override {
+ raster_worker_pool_->AsRasterizer()->Shutdown();
+ raster_worker_pool_->AsRasterizer()->CheckForCompletedTasks();
}
// Overriden from RasterWorkerPoolClient:
- virtual bool ShouldForceTasksRequiredForActivationToComplete()
- const OVERRIDE {
- return false;
+ void DidFinishRunningTasks(TaskSet task_set) override {
+ if (task_set == ALL) {
+ raster_worker_pool_->AsRasterizer()->CheckForCompletedTasks();
+ base::MessageLoop::current()->Quit();
+ }
}
- virtual void DidFinishRunningTasks() OVERRIDE {
- raster_worker_pool_->CheckForCompletedTasks();
- base::MessageLoop::current()->Quit();
+ TaskSetCollection TasksThatShouldBeForcedToComplete() const override {
+ return TaskSetCollection();
}
- virtual void DidFinishRunningTasksRequiredForActivation() OVERRIDE {}
void RunMessageLoopUntilAllTasksHaveCompleted() {
if (timeout_seconds_) {
for (RasterTaskVector::const_iterator it = tasks_.begin();
it != tasks_.end();
- ++it)
- queue.items.push_back(RasterTaskQueue::Item(*it, false));
+ ++it) {
+ TaskSetCollection task_sets;
+ task_sets[ALL] = true;
+ queue.items.push_back(RasterTaskQueue::Item(it->get(), task_sets));
+ }
- raster_worker_pool_->ScheduleTasks(&queue);
+ raster_worker_pool_->AsRasterizer()->ScheduleTasks(&queue);
}
- void AppendTask(unsigned id) {
- const gfx::Size size(1, 1);
-
+ void AppendTask(unsigned id, const gfx::Size& size) {
scoped_ptr<ScopedResource> resource(
ScopedResource::Create(resource_provider_.get()));
- resource->Allocate(size, ResourceProvider::TextureUsageAny, RGBA_8888);
+ resource->Allocate(size, ResourceProvider::TextureHintImmutable, RGBA_8888);
const Resource* const_resource = resource.get();
- internal::WorkerPoolTask::Vector empty;
- tasks_.push_back(new TestRasterWorkerPoolTaskImpl(
+ ImageDecodeTask::Vector empty;
+ tasks_.push_back(new TestRasterTaskImpl(
const_resource,
base::Bind(&RasterWorkerPoolTest::OnTaskCompleted,
base::Unretained(this),
&empty));
}
+ void AppendTask(unsigned id) { AppendTask(id, gfx::Size(1, 1)); }
+
void AppendBlockingTask(unsigned id, base::Lock* lock) {
const gfx::Size size(1, 1);
scoped_ptr<ScopedResource> resource(
ScopedResource::Create(resource_provider_.get()));
- resource->Allocate(size, ResourceProvider::TextureUsageAny, RGBA_8888);
+ resource->Allocate(size, ResourceProvider::TextureHintImmutable, RGBA_8888);
const Resource* const_resource = resource.get();
- internal::WorkerPoolTask::Vector empty;
- tasks_.push_back(new BlockingTestRasterWorkerPoolTaskImpl(
+ ImageDecodeTask::Vector empty;
+ tasks_.push_back(new BlockingTestRasterTaskImpl(
const_resource,
base::Bind(&RasterWorkerPoolTest::OnTaskCompleted,
base::Unretained(this),
}
private:
+ void Create3dOutputSurfaceAndResourceProvider() {
+ output_surface_ = FakeOutputSurface::Create3d(context_provider_).Pass();
+ CHECK(output_surface_->BindToClient(&output_surface_client_));
+ TestWebGraphicsContext3D* context3d = context_provider_->TestContext3d();
+ context3d->set_support_sync_query(true);
+ resource_provider_ = ResourceProvider::Create(output_surface_.get(),
+ NULL,
+ &gpu_memory_buffer_manager_,
+ NULL,
+ 0,
+ false,
+ 1).Pass();
+ }
+
+ void CreateSoftwareOutputSurfaceAndResourceProvider() {
+ output_surface_ = FakeOutputSurface::CreateSoftware(
+ make_scoped_ptr(new SoftwareOutputDevice));
+ CHECK(output_surface_->BindToClient(&output_surface_client_));
+ resource_provider_ = ResourceProvider::Create(output_surface_.get(),
+ &shared_bitmap_manager_,
+ NULL,
+ NULL,
+ 0,
+ false,
+ 1).Pass();
+ }
+
void OnTaskCompleted(scoped_ptr<ScopedResource> resource,
unsigned id,
- const PicturePileImpl::Analysis& analysis,
- bool was_canceled,
- RasterThread raster_thread) {
+ const RasterSource::SolidColorAnalysis& analysis,
+ bool was_canceled) {
RasterTaskResult result;
result.id = id;
result.canceled = was_canceled;
- result.raster_thread = raster_thread;
completed_tasks_.push_back(result);
}
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_;
+ TestGpuMemoryBufferManager gpu_memory_buffer_manager_;
+ TestSharedBitmapManager shared_bitmap_manager_;
base::CancelableClosure timeout_;
int timeout_seconds_;
bool timed_out_;
ASSERT_EQ(2u, completed_tasks().size());
EXPECT_FALSE(completed_tasks()[0].canceled);
EXPECT_FALSE(completed_tasks()[1].canceled);
- EXPECT_NE(RASTER_THREAD_NONE, completed_tasks()[0].raster_thread);
- EXPECT_NE(RASTER_THREAD_NONE, completed_tasks()[1].raster_thread);
}
TEST_P(RasterWorkerPoolTest, FailedMapResource) {
+ if (GetParam() == RASTER_WORKER_POOL_TYPE_BITMAP)
+ return;
+
TestWebGraphicsContext3D* context3d = context_provider_->TestContext3d();
- context3d->set_times_map_image_chromium_succeeds(0);
context3d->set_times_map_buffer_chromium_succeeds(0);
AppendTask(0u);
ScheduleTasks();
ASSERT_EQ(1u, completed_tasks().size());
EXPECT_FALSE(completed_tasks()[0].canceled);
- EXPECT_NE(RASTER_THREAD_NONE, completed_tasks()[0].raster_thread);
}
// This test checks that replacing a pending raster task with another does
RunMessageLoopUntilAllTasksHaveCompleted();
}
+TEST_P(RasterWorkerPoolTest, LargeResources) {
+ gfx::Size size(kLargeResourceDimension, kLargeResourceDimension);
+
+ {
+ // Verify a resource of this size is larger than the transfer buffer.
+ scoped_ptr<ScopedResource> resource(
+ ScopedResource::Create(resource_provider_.get()));
+ resource->Allocate(size, ResourceProvider::TextureHintImmutable, RGBA_8888);
+ EXPECT_GE(resource->bytes(), kMaxTransferBufferUsageBytes);
+ }
+
+ AppendTask(0u, size);
+ AppendTask(1u, size);
+ AppendTask(2u, size);
+ ScheduleTasks();
+
+ // This will time out if a resource that is larger than the throttle limit
+ // never gets scheduled.
+ RunMessageLoopUntilAllTasksHaveCompleted();
+}
+
INSTANTIATE_TEST_CASE_P(RasterWorkerPoolTests,
RasterWorkerPoolTest,
::testing::Values(RASTER_WORKER_POOL_TYPE_PIXEL_BUFFER,
- RASTER_WORKER_POOL_TYPE_IMAGE,
- RASTER_WORKER_POOL_TYPE_DIRECT));
+ RASTER_WORKER_POOL_TYPE_ZERO_COPY,
+ RASTER_WORKER_POOL_TYPE_ONE_COPY,
+ RASTER_WORKER_POOL_TYPE_GPU,
+ RASTER_WORKER_POOL_TYPE_BITMAP));
} // namespace
} // namespace cc
projects / platform / framework / web / crosswalk.git / blobdiff