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

Unified Diff: cc/resources/tile_manager.cc

Issue 562833004: cc: Move RasterBuffer implementations from ResourceProvider to RasterWorkerPool implementations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move NullCanvas change to separate patch Created 6 years, 3 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
Index: cc/resources/tile_manager.cc
diff --git a/cc/resources/tile_manager.cc b/cc/resources/tile_manager.cc
index 55fb6267a460a0901e9b9e59c8c061298fb9de3e..654f84830ceb94a6139f7a17f4c83759dd3904b1 100644
--- a/cc/resources/tile_manager.cc
+++ b/cc/resources/tile_manager.cc
@@ -17,6 +17,7 @@
#include "cc/debug/frame_viewer_instrumentation.h"
#include "cc/debug/traced_value.h"
#include "cc/layers/picture_layer_impl.h"
+#include "cc/resources/raster_buffer.h"
#include "cc/resources/rasterizer.h"
#include "cc/resources/tile.h"
#include "skia/ext/paint_simplifier.h"
@@ -58,8 +59,7 @@ class RasterTaskImpl : public RasterTask {
source_frame_number_(source_frame_number),
analyze_picture_(analyze_picture),
rendering_stats_(rendering_stats),
- reply_(reply),
- raster_buffer_(NULL) {}
+ reply_(reply) {}
// Overridden from Task:
virtual void RunOnWorkerThread() OVERRIDE {
@@ -80,11 +80,10 @@ class RasterTaskImpl : public RasterTask {
// Overridden from RasterizerTask:
virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) OVERRIDE {
DCHECK(!raster_buffer_);
- raster_buffer_ = client->AcquireBufferForRaster(this);
+ raster_buffer_ = client->AcquireBufferForRaster(resource());
}
virtual void CompleteOnOriginThread(RasterizerTaskClient* client) OVERRIDE {
- raster_buffer_ = NULL;
- client->ReleaseBufferForRaster(this);
+ client->ReleaseBufferForRaster(raster_buffer_.Pass());
}
virtual void RunReplyOnOriginThread() OVERRIDE {
DCHECK(!raster_buffer_);
@@ -177,7 +176,7 @@ class RasterTaskImpl : public RasterTask {
bool analyze_picture_;
RenderingStatsInstrumentation* rendering_stats_;
const base::Callback<void(const PicturePileImpl::Analysis&, bool)> reply_;
- RasterBuffer* raster_buffer_;
+ scoped_ptr<RasterBuffer> raster_buffer_;
DISALLOW_COPY_AND_ASSIGN(RasterTaskImpl);
};

Powered by Google App Engine
This is Rietveld 408576698