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

Unified Diff: cc/resources/raster_worker_pool_unittest.cc

Issue 110883015: Add preliminary support for hw-accelerated tile rasterization. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: task completion callback Created 7 years 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_unittest.cc
diff --git a/cc/resources/raster_worker_pool_unittest.cc b/cc/resources/raster_worker_pool_unittest.cc
index 716edf6c5263ef1380f60e6a0617c22bfe93c46d..a25492c7fd09271d15d4e4e77ea36ce135153336 100644
--- a/cc/resources/raster_worker_pool_unittest.cc
+++ b/cc/resources/raster_worker_pool_unittest.cc
@@ -29,8 +29,11 @@ class TestRasterWorkerPoolTaskImpl : public internal::RasterWorkerPoolTask {
TestRasterWorkerPoolTaskImpl(
const Resource* resource,
const Reply& reply,
- TaskVector* dependencies)
- : internal::RasterWorkerPoolTask(resource, dependencies),
+ TaskVector* dependencies,
+ bool use_gpu_rasterization)
+ : internal::RasterWorkerPoolTask(resource,
+ dependencies,
+ use_gpu_rasterization),
reply_(reply),
did_raster_(false) {}
@@ -42,6 +45,10 @@ class TestRasterWorkerPoolTaskImpl : public internal::RasterWorkerPoolTask {
did_raster_ = true;
return true;
}
+ virtual void RunOnOriginThread(ResourceProvider* resource_provider,
+ ContextProvider* context_provider) OVERRIDE {
+ did_raster_ = true;
+ }
virtual void CompleteOnOriginThread() OVERRIDE {
reply_.Run(PicturePileImpl::Analysis(), !HasFinishedRunning(), did_raster_);
}
@@ -104,11 +111,12 @@ class RasterWorkerPoolTest : public testing::Test,
void RunTest(bool use_map_image) {
if (use_map_image) {
raster_worker_pool_ = ImageRasterWorkerPool::Create(
- resource_provider(), 1, GL_TEXTURE_2D);
+ resource_provider(), NULL, 1, GL_TEXTURE_2D);
} else {
raster_worker_pool_ =
PixelBufferRasterWorkerPool::Create(
resource_provider(),
+ NULL,
1,
std::numeric_limits<size_t>::max());
}
@@ -171,7 +179,8 @@ class RasterWorkerPoolTest : public testing::Test,
base::Unretained(this),
base::Passed(&resource),
id),
- &empty.tasks_)));
+ &empty.tasks_,
+ false)));
}
virtual void OnTaskCompleted(scoped_ptr<ScopedResource> resource,

Powered by Google App Engine
This is Rietveld 408576698