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

Unified Diff: cc/resources/raster_worker_pool_unittest.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: build fix 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/raster_worker_pool_unittest.cc
diff --git a/cc/resources/raster_worker_pool_unittest.cc b/cc/resources/raster_worker_pool_unittest.cc
index 172d0873cbff9815f8a965551d2b6faa3396b1be..2386e0a0daad38d8dbf6d470e38e8fd6bf96130e 100644
--- a/cc/resources/raster_worker_pool_unittest.cc
+++ b/cc/resources/raster_worker_pool_unittest.cc
@@ -14,6 +14,7 @@
#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"
@@ -50,14 +51,19 @@ class TestRasterTaskImpl : public RasterTask {
: RasterTask(resource, dependencies), reply_(reply) {}
// Overridden from Task:
- virtual void RunOnWorkerThread() OVERRIDE {}
+ virtual void RunOnWorkerThread() OVERRIDE {
+ skia::RefPtr<SkCanvas> canvas = raster_buffer_->AcquireSkCanvas();
+ DCHECK(canvas);
+ canvas->drawColor(SK_ColorWHITE);
+ raster_buffer_->ReleaseSkCanvas(canvas);
+ }
// Overridden from RasterizerTask:
virtual void ScheduleOnOriginThread(RasterizerTaskClient* client) OVERRIDE {
- client->AcquireBufferForRaster(this);
+ raster_buffer_ = client->AcquireBufferForRaster(resource());
}
virtual void CompleteOnOriginThread(RasterizerTaskClient* client) OVERRIDE {
- client->ReleaseBufferForRaster(this);
+ client->ReleaseBufferForRaster(raster_buffer_.Pass());
}
virtual void RunReplyOnOriginThread() OVERRIDE {
reply_.Run(PicturePileImpl::Analysis(), !HasFinishedRunning());
@@ -68,6 +74,7 @@ class TestRasterTaskImpl : public RasterTask {
private:
const Reply reply_;
+ scoped_ptr<RasterBuffer> raster_buffer_;
DISALLOW_COPY_AND_ASSIGN(TestRasterTaskImpl);
};
@@ -116,6 +123,9 @@ class RasterWorkerPoolTest
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);
+
shared_bitmap_manager_.reset(new TestSharedBitmapManager());
resource_provider_ = ResourceProvider::Create(output_surface_.get(),
shared_bitmap_manager_.get(),

Powered by Google App Engine
This is Rietveld 408576698