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

Side by Side Diff: cc/resources/image_raster_worker_pool.cc

Issue 16431003: Fix DCHECK during TileManager shutdown (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « cc/resources/image_raster_worker_pool.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/resources/image_raster_worker_pool.h" 5 #include "cc/resources/image_raster_worker_pool.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "cc/resources/resource.h" 8 #include "cc/resources/resource.h"
9 #include "third_party/skia/include/core/SkDevice.h" 9 #include "third_party/skia/include/core/SkDevice.h"
10 10
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 59
60 ImageRasterWorkerPool::ImageRasterWorkerPool( 60 ImageRasterWorkerPool::ImageRasterWorkerPool(
61 ResourceProvider* resource_provider, size_t num_threads) 61 ResourceProvider* resource_provider, size_t num_threads)
62 : RasterWorkerPool(resource_provider, num_threads) { 62 : RasterWorkerPool(resource_provider, num_threads) {
63 } 63 }
64 64
65 ImageRasterWorkerPool::~ImageRasterWorkerPool() { 65 ImageRasterWorkerPool::~ImageRasterWorkerPool() {
66 DCHECK_EQ(0u, image_tasks_.size()); 66 DCHECK_EQ(0u, image_tasks_.size());
67 } 67 }
68 68
69 void ImageRasterWorkerPool::Shutdown() {
70 RasterWorkerPool::Shutdown();
71 ScheduleRasterTasks(RootTask());
72 }
73
69 void ImageRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) { 74 void ImageRasterWorkerPool::ScheduleTasks(RasterTask::Queue* queue) {
70 TRACE_EVENT0("cc", "ImageRasterWorkerPool::ScheduleTasks"); 75 TRACE_EVENT0("cc", "ImageRasterWorkerPool::ScheduleTasks");
71 76
72 internal::WorkerPoolTask::TaskVector tasks; 77 internal::WorkerPoolTask::TaskVector tasks;
73 78
74 RasterWorkerPool::SetRasterTasks(queue); 79 RasterWorkerPool::SetRasterTasks(queue);
75 80
76 for (RasterTask::Queue::TaskVector::const_iterator it = 81 for (RasterTask::Queue::TaskVector::const_iterator it =
77 raster_tasks().begin(); 82 raster_tasks().begin();
78 it != raster_tasks().end(); ++it) { 83 it != raster_tasks().end(); ++it) {
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 if (!was_canceled) 139 if (!was_canceled)
135 task->DidRun(); 140 task->DidRun();
136 141
137 task->DidComplete(); 142 task->DidComplete();
138 task->DispatchCompletionCallback(); 143 task->DispatchCompletionCallback();
139 144
140 image_tasks_.erase(task); 145 image_tasks_.erase(task);
141 } 146 }
142 147
143 } // namespace cc 148 } // namespace cc
OLDNEW
« no previous file with comments | « cc/resources/image_raster_worker_pool.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698