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

Side by Side Diff: cc/tiles/tile_task_manager.cc

Issue 1866043006: cc: Remove ScheduleOnOriginThread() and CompleteOnOriginThread(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed bug 613529 Created 4 years, 7 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
« cc/tiles/tile_task_manager.h ('K') | « cc/tiles/tile_task_manager.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/tiles/tile_task_manager.h" 5 #include "cc/tiles/tile_task_manager.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/trace_event/trace_event.h" 8 #include "base/trace_event/trace_event.h"
9 9
10 namespace cc { 10 namespace cc {
(...skipping 10 matching lines...) Expand all
21 std::move(raster_buffer_provider), task_graph_runner)); 21 std::move(raster_buffer_provider), task_graph_runner));
22 } 22 }
23 23
24 TileTaskManagerImpl::TileTaskManagerImpl( 24 TileTaskManagerImpl::TileTaskManagerImpl(
25 std::unique_ptr<RasterBufferProvider> raster_buffer_provider, 25 std::unique_ptr<RasterBufferProvider> raster_buffer_provider,
26 TaskGraphRunner* task_graph_runner) 26 TaskGraphRunner* task_graph_runner)
27 : raster_buffer_provider_(std::move(raster_buffer_provider)), 27 : raster_buffer_provider_(std::move(raster_buffer_provider)),
28 task_graph_runner_(task_graph_runner), 28 task_graph_runner_(task_graph_runner),
29 namespace_token_(task_graph_runner->GetNamespaceToken()) {} 29 namespace_token_(task_graph_runner->GetNamespaceToken()) {}
30 30
31 TileTaskManagerImpl::~TileTaskManagerImpl() { 31 TileTaskManagerImpl::~TileTaskManagerImpl() {}
32 DCHECK_EQ(0u, completed_tasks_.size());
33 }
34 32
35 void TileTaskManagerImpl::ScheduleTasks(TaskGraph* graph) { 33 void TileTaskManagerImpl::ScheduleTasks(TaskGraph* graph) {
36 TRACE_EVENT0("cc", "TileTaskManagerImpl::ScheduleTasks"); 34 TRACE_EVENT0("cc", "TileTaskManagerImpl::ScheduleTasks");
37 35
38 for (TaskGraph::Node::Vector::iterator it = graph->nodes.begin();
39 it != graph->nodes.end(); ++it) {
40 TaskGraph::Node& node = *it;
41 TileTask* task = static_cast<TileTask*>(node.task);
42
43 if (!task->HasBeenScheduled()) {
44 task->WillSchedule();
45 task->ScheduleOnOriginThread(raster_buffer_provider_.get());
46 task->DidSchedule();
47 }
48 }
49
50 raster_buffer_provider_->OrderingBarrier(); 36 raster_buffer_provider_->OrderingBarrier();
51
52 task_graph_runner_->ScheduleTasks(namespace_token_, graph); 37 task_graph_runner_->ScheduleTasks(namespace_token_, graph);
53 } 38 }
54 39
55 void TileTaskManagerImpl::CheckForCompletedTasks() { 40 void TileTaskManagerImpl::CheckForCompletedTasks() {
56 TRACE_EVENT0("cc", "TileTaskManagerImpl::CheckForCompletedTasks"); 41 TRACE_EVENT0("cc", "TileTaskManagerImpl::CheckForCompletedTasks");
42 Task::Vector completed_tasks;
43 task_graph_runner_->CollectCompletedTasks(namespace_token_, &completed_tasks);
57 44
58 task_graph_runner_->CollectCompletedTasks(namespace_token_, 45 for (auto& task : completed_tasks) {
59 &completed_tasks_); 46 DCHECK(task->state().IsFinished() || task->state().IsCanceled());
60 for (Task::Vector::const_iterator it = completed_tasks_.begin(); 47 TileTask* tile_task = static_cast<TileTask*>(task.get());
61 it != completed_tasks_.end(); ++it) { 48 tile_task->OnTaskCompleted();
62 TileTask* task = static_cast<TileTask*>(it->get()); 49 }
63 50
64 task->WillComplete(); 51 completed_tasks.clear();
vmpstr 2016/05/21 00:02:14 you don't need this.
prashant.n 2016/05/21 00:51:45 Hmm.
65 task->CompleteOnOriginThread(raster_buffer_provider_.get());
66 task->DidComplete();
67 }
68 completed_tasks_.clear();
69 } 52 }
70 53
71 void TileTaskManagerImpl::Shutdown() { 54 void TileTaskManagerImpl::Shutdown() {
72 TRACE_EVENT0("cc", "TileTaskManagerImpl::Shutdown"); 55 TRACE_EVENT0("cc", "TileTaskManagerImpl::Shutdown");
73 56
74 // Cancel non-scheduled tasks and wait for running tasks to finish. 57 // Cancel non-scheduled tasks and wait for running tasks to finish.
75 TaskGraph empty; 58 TaskGraph empty;
76 task_graph_runner_->ScheduleTasks(namespace_token_, &empty); 59 task_graph_runner_->ScheduleTasks(namespace_token_, &empty);
77 task_graph_runner_->WaitForTasksToFinishRunning(namespace_token_); 60 task_graph_runner_->WaitForTasksToFinishRunning(namespace_token_);
78 61
79 raster_buffer_provider_->Shutdown(); 62 raster_buffer_provider_->Shutdown();
80 } 63 }
81 64
82 RasterBufferProvider* TileTaskManagerImpl::GetRasterBufferProvider() const { 65 RasterBufferProvider* TileTaskManagerImpl::GetRasterBufferProvider() const {
83 return raster_buffer_provider_.get(); 66 return raster_buffer_provider_.get();
84 } 67 }
85 68
86 } // namespace cc 69 } // namespace cc
OLDNEW
« cc/tiles/tile_task_manager.h ('K') | « cc/tiles/tile_task_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698