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

Side by Side Diff: webkit/quota/quota_task.cc

Issue 10197007: Change webkit/{fileapi,quota} code to use TaskRunner. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: test fix Created 8 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 | Annotate | Revision Log
« no previous file with comments | « webkit/quota/quota_task.h ('k') | webkit/quota/usage_tracker.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "webkit/quota/quota_task.h" 5 #include "webkit/quota/quota_task.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/location.h"
11 #include "base/message_loop.h" 12 #include "base/message_loop.h"
12 #include "base/message_loop_proxy.h" 13 #include "base/message_loop_proxy.h"
14 #include "base/single_thread_task_runner.h"
13 15
14 using base::MessageLoopProxy; 16 using base::TaskRunner;
15 17
16 namespace quota { 18 namespace quota {
17 19
18 // QuotaTask --------------------------------------------------------------- 20 // QuotaTask ---------------------------------------------------------------
19 21
20 QuotaTask::~QuotaTask() { 22 QuotaTask::~QuotaTask() {
21 } 23 }
22 24
23 void QuotaTask::Start() { 25 void QuotaTask::Start() {
24 DCHECK(observer_); 26 DCHECK(observer_);
25 observer()->RegisterTask(this); 27 observer()->RegisterTask(this);
26 Run(); 28 Run();
27 } 29 }
28 30
29 QuotaTask::QuotaTask(QuotaTaskObserver* observer) 31 QuotaTask::QuotaTask(QuotaTaskObserver* observer)
30 : observer_(observer), 32 : observer_(observer),
31 original_message_loop_(MessageLoopProxy::current()) { 33 original_task_runner_(base::MessageLoopProxy::current()) {
32 } 34 }
33 35
34 void QuotaTask::CallCompleted() { 36 void QuotaTask::CallCompleted() {
35 DCHECK(original_message_loop_->BelongsToCurrentThread()); 37 DCHECK(original_task_runner_->BelongsToCurrentThread());
36 if (observer_) { 38 if (observer_) {
37 observer_->UnregisterTask(this); 39 observer_->UnregisterTask(this);
38 Completed(); 40 Completed();
39 } 41 }
40 } 42 }
41 43
42 void QuotaTask::Abort() { 44 void QuotaTask::Abort() {
43 DCHECK(original_message_loop_->BelongsToCurrentThread()); 45 DCHECK(original_task_runner_->BelongsToCurrentThread());
44 observer_ = NULL; 46 observer_ = NULL;
45 Aborted(); 47 Aborted();
46 } 48 }
47 49
48 void QuotaTask::DeleteSoon() { 50 void QuotaTask::DeleteSoon() {
49 MessageLoop::current()->DeleteSoon(FROM_HERE, this); 51 MessageLoop::current()->DeleteSoon(FROM_HERE, this);
50 } 52 }
51 53
52 // QuotaThreadTask --------------------------------------------------------- 54 // QuotaThreadTask ---------------------------------------------------------
53 55
54 QuotaThreadTask::QuotaThreadTask( 56 QuotaThreadTask::QuotaThreadTask(
55 QuotaTaskObserver* observer, 57 QuotaTaskObserver* observer,
56 scoped_refptr<MessageLoopProxy> target_message_loop) 58 TaskRunner* target_task_runner)
57 : QuotaTask(observer), 59 : QuotaTask(observer),
58 target_message_loop_(target_message_loop) { 60 target_task_runner_(target_task_runner) {
59 } 61 }
60 62
61 QuotaThreadTask::~QuotaThreadTask() { 63 QuotaThreadTask::~QuotaThreadTask() {
62 } 64 }
63 65
64 void QuotaThreadTask::Run() { 66 void QuotaThreadTask::Run() {
65 target_message_loop_->PostTask( 67 target_task_runner_->PostTask(
66 FROM_HERE, 68 FROM_HERE,
67 base::Bind(&QuotaThreadTask::CallRunOnTargetThread, this)); 69 base::Bind(&QuotaThreadTask::CallRunOnTargetThread, this));
68 } 70 }
69 71
70 void QuotaThreadTask::CallRunOnTargetThread() { 72 void QuotaThreadTask::CallRunOnTargetThread() {
71 DCHECK(target_message_loop_->BelongsToCurrentThread()); 73 DCHECK(target_task_runner_->RunsTasksOnCurrentThread());
72 if (RunOnTargetThreadAsync()) 74 if (RunOnTargetThreadAsync())
73 original_message_loop()->PostTask( 75 original_task_runner()->PostTask(
74 FROM_HERE, 76 FROM_HERE,
75 base::Bind(&QuotaThreadTask::CallCompleted, this)); 77 base::Bind(&QuotaThreadTask::CallCompleted, this));
76 } 78 }
77 79
78 bool QuotaThreadTask::RunOnTargetThreadAsync() { 80 bool QuotaThreadTask::RunOnTargetThreadAsync() {
79 RunOnTargetThread(); 81 RunOnTargetThread();
80 return true; 82 return true;
81 } 83 }
82 84
83 void QuotaThreadTask::RunOnTargetThread() { 85 void QuotaThreadTask::RunOnTargetThread() {
(...skipping 13 matching lines...) Expand all
97 void QuotaTaskObserver::RegisterTask(QuotaTask* task) { 99 void QuotaTaskObserver::RegisterTask(QuotaTask* task) {
98 running_quota_tasks_.insert(task); 100 running_quota_tasks_.insert(task);
99 } 101 }
100 102
101 void QuotaTaskObserver::UnregisterTask(QuotaTask* task) { 103 void QuotaTaskObserver::UnregisterTask(QuotaTask* task) {
102 DCHECK(running_quota_tasks_.find(task) != running_quota_tasks_.end()); 104 DCHECK(running_quota_tasks_.find(task) != running_quota_tasks_.end());
103 running_quota_tasks_.erase(task); 105 running_quota_tasks_.erase(task);
104 } 106 }
105 107
106 } // namespace quota 108 } // namespace quota
OLDNEW
« no previous file with comments | « webkit/quota/quota_task.h ('k') | webkit/quota/usage_tracker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698