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

Unified Diff: cc/resources/raster_worker_pool.cc

Issue 669813003: Update from chromium https://crrev.com/301725/ (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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/resources/raster_worker_pool.h ('k') | cc/resources/raster_worker_pool_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/raster_worker_pool.cc
diff --git a/cc/resources/raster_worker_pool.cc b/cc/resources/raster_worker_pool.cc
index a52e0199e5e8c5fde4c9f86ab0245e64f757152c..bd917404510b475656a7ec59167617544b8d84de 100644
--- a/cc/resources/raster_worker_pool.cc
+++ b/cc/resources/raster_worker_pool.cc
@@ -11,7 +11,8 @@
#include "base/strings/stringprintf.h"
#include "base/threading/simple_thread.h"
#include "cc/base/scoped_ptr_deque.h"
-#include "cc/resources/picture_pile_impl.h"
+#include "cc/resources/raster_source.h"
+#include "third_party/skia/include/core/SkCanvas.h"
namespace cc {
namespace {
@@ -198,7 +199,7 @@ void RasterWorkerPool::PlaybackToMemory(void* memory,
ResourceFormat format,
const gfx::Size& size,
int stride,
- const PicturePileImpl* picture_pile,
+ const RasterSource* raster_source,
const gfx::Rect& rect,
float scale,
RenderingStatsInstrumentation* stats) {
@@ -225,7 +226,7 @@ void RasterWorkerPool::PlaybackToMemory(void* memory,
}
SkCanvas canvas(bitmap);
- picture_pile->RasterToBitmap(&canvas, rect, scale, stats);
+ raster_source->PlaybackToCanvas(&canvas, rect, scale, stats);
SkColorType buffer_color_type = ResourceFormatToSkColorType(format);
if (buffer_color_type != bitmap.colorType()) {
« no previous file with comments | « cc/resources/raster_worker_pool.h ('k') | cc/resources/raster_worker_pool_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698