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

Unified Diff: cc/raster/tile_task_worker_pool_unittest.cc

Issue 1405883002: cc: Remove the base RasterSource (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge more Created 5 years, 2 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
« no previous file with comments | « cc/raster/tile_task_worker_pool.cc ('k') | cc/raster/zero_copy_tile_task_worker_pool.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/raster/tile_task_worker_pool_unittest.cc
diff --git a/cc/raster/tile_task_worker_pool_unittest.cc b/cc/raster/tile_task_worker_pool_unittest.cc
index 515035bed834918cf06a41d96d6e8f489e3f88a2..b97f3ae1bafdf27ade1a95e014510e7d4351ad06 100644
--- a/cc/raster/tile_task_worker_pool_unittest.cc
+++ b/cc/raster/tile_task_worker_pool_unittest.cc
@@ -48,8 +48,9 @@ enum TileTaskWorkerPoolType {
class TestRasterTaskImpl : public RasterTask {
public:
- typedef base::Callback<void(const RasterSource::SolidColorAnalysis& analysis,
- bool was_canceled)> Reply;
+ typedef base::Callback<void(
+ const DisplayListRasterSource::SolidColorAnalysis& analysis,
+ bool was_canceled)> Reply;
TestRasterTaskImpl(const Resource* resource,
const Reply& reply,
@@ -75,7 +76,8 @@ class TestRasterTaskImpl : public RasterTask {
}
void CompleteOnOriginThread(TileTaskClient* client) override {
client->ReleaseBufferForRaster(raster_buffer_.Pass());
- reply_.Run(RasterSource::SolidColorAnalysis(), !HasFinishedRunning());
+ reply_.Run(DisplayListRasterSource::SolidColorAnalysis(),
+ !HasFinishedRunning());
}
protected:
@@ -85,7 +87,7 @@ class TestRasterTaskImpl : public RasterTask {
const Resource* resource_;
const Reply reply_;
scoped_ptr<RasterBuffer> raster_buffer_;
- scoped_refptr<RasterSource> raster_source_;
+ scoped_refptr<DisplayListRasterSource> raster_source_;
DISALLOW_COPY_AND_ASSIGN(TestRasterTaskImpl);
};
@@ -288,10 +290,11 @@ class TileTaskWorkerPoolTest
output_surface_.get(), &shared_bitmap_manager_, nullptr);
}
- void OnTaskCompleted(scoped_ptr<ScopedResource> resource,
- unsigned id,
- const RasterSource::SolidColorAnalysis& analysis,
- bool was_canceled) {
+ void OnTaskCompleted(
+ scoped_ptr<ScopedResource> resource,
+ unsigned id,
+ const DisplayListRasterSource::SolidColorAnalysis& analysis,
+ bool was_canceled) {
RasterTaskResult result;
result.id = id;
result.canceled = was_canceled;
« no previous file with comments | « cc/raster/tile_task_worker_pool.cc ('k') | cc/raster/zero_copy_tile_task_worker_pool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698