From fecb03b2ee6edacdef469c3b711360cc9f52a8ab Mon Sep 17 00:00:00 2001 From: "reveman@chromium.org" Date: Thu, 11 Jul 2013 22:00:41 +0000 Subject: cc: Fix incorrect completion of tiles and missing "ready to activate" signal. The presence of completed tiles in |tasks_required_for_activation_| prevents us from generating a "ready to activate" signal and can result in an inability to activate the pending tree. Incorrectly canceling tasks can result in the pending tree being activated without all tiles required for activation being properly initialized. BUG=257601 Review URL: https://chromiumcodereview.appspot.com/18614012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211225 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/resources/raster_worker_pool.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'cc/resources/raster_worker_pool.h') diff --git a/cc/resources/raster_worker_pool.h b/cc/resources/raster_worker_pool.h index fd4551b..88bce1d 100644 --- a/cc/resources/raster_worker_pool.h +++ b/cc/resources/raster_worker_pool.h @@ -209,6 +209,7 @@ class CC_EXPORT RasterWorkerPool : public WorkerPool { typedef std::vector > TaskVector; typedef std::vector > RasterTaskVector; + typedef base::hash_set RasterTaskSet; typedef internal::RasterWorkerPoolTask* TaskMapKey; typedef base::hash_map > TaskMap; @@ -224,8 +225,9 @@ class CC_EXPORT RasterWorkerPool : public WorkerPool { RasterWorkerPoolClient* client() const { return client_; } ResourceProvider* resource_provider() const { return resource_provider_; } - const RasterTask::Queue::TaskVector& raster_tasks() const { - return raster_tasks_; + const RasterTaskVector& raster_tasks() const { return raster_tasks_; } + const RasterTaskSet& raster_tasks_required_for_activation() const { + return raster_tasks_required_for_activation_; } void set_raster_finished_task( scoped_refptr raster_finished_task) { -- cgit v1.1