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

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
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/message_loop.h" 11 #include "base/location.h"
12 #include "base/message_loop_proxy.h" 12 #include "base/message_loop_proxy.h"
13 #include "base/single_thread_task_runner.h"
13 14
14 using base::MessageLoopProxy; 15 using base::TaskRunner;
15 16
16 namespace quota { 17 namespace quota {
17 18
18 // QuotaTask --------------------------------------------------------------- 19 // QuotaTask ---------------------------------------------------------------
19 20
20 QuotaTask::~QuotaTask() { 21 QuotaTask::~QuotaTask() {
21 } 22 }
22 23
23 void QuotaTask::Start() { 24 void QuotaTask::Start() {
24 DCHECK(observer_); 25 DCHECK(observer_);
25 observer()->RegisterTask(this); 26 observer()->RegisterTask(this);
26 Run(); 27 Run();
27 } 28 }
28 29
29 QuotaTask::QuotaTask(QuotaTaskObserver* observer) 30 QuotaTask::QuotaTask(QuotaTaskObserver* observer)
30 : observer_(observer), 31 : observer_(observer),
31 original_message_loop_(MessageLoopProxy::current()) { 32 original_task_runner_(base::MessageLoopProxy::current()) {
32 } 33 }
33 34
34 void QuotaTask::CallCompleted() { 35 void QuotaTask::CallCompleted() {
35 DCHECK(original_message_loop_->BelongsToCurrentThread()); 36 DCHECK(original_task_runner_->BelongsToCurrentThread());
36 if (observer_) { 37 if (observer_) {
37 observer_->UnregisterTask(this); 38 observer_->UnregisterTask(this);
38 Completed(); 39 Completed();
39 } 40 }
40 } 41 }
41 42
42 void QuotaTask::Abort() { 43 void QuotaTask::Abort() {
43 DCHECK(original_message_loop_->BelongsToCurrentThread()); 44 DCHECK(original_task_runner_->BelongsToCurrentThread());
44 observer_ = NULL; 45 observer_ = NULL;
45 Aborted(); 46 Aborted();
46 } 47 }
47 48
48 void QuotaTask::DeleteSoon() { 49 void QuotaTask::DeleteSoon() {
49 MessageLoop::current()->DeleteSoon(FROM_HERE, this); 50 original_task_runner_->DeleteSoon(FROM_HERE, this);
michaeln 2012/04/27 01:04:03 Is it ok to make this change, previously the delet
kinuko 2012/04/27 10:10:29 Reverted this for compatibility reasons.
50 } 51 }
51 52
52 // QuotaThreadTask --------------------------------------------------------- 53 // QuotaThreadTask ---------------------------------------------------------
53 54
54 QuotaThreadTask::QuotaThreadTask( 55 QuotaThreadTask::QuotaThreadTask(
55 QuotaTaskObserver* observer, 56 QuotaTaskObserver* observer,
56 scoped_refptr<MessageLoopProxy> target_message_loop) 57 TaskRunner* target_task_runner)
57 : QuotaTask(observer), 58 : QuotaTask(observer),
58 target_message_loop_(target_message_loop) { 59 target_task_runner_(target_task_runner) {
59 } 60 }
60 61
61 QuotaThreadTask::~QuotaThreadTask() { 62 QuotaThreadTask::~QuotaThreadTask() {
62 } 63 }
63 64
64 void QuotaThreadTask::Run() { 65 void QuotaThreadTask::Run() {
65 target_message_loop_->PostTask( 66 target_task_runner_->PostTask(
66 FROM_HERE, 67 FROM_HERE,
67 base::Bind(&QuotaThreadTask::CallRunOnTargetThread, this)); 68 base::Bind(&QuotaThreadTask::CallRunOnTargetThread, this));
68 } 69 }
69 70
70 void QuotaThreadTask::CallRunOnTargetThread() { 71 void QuotaThreadTask::CallRunOnTargetThread() {
71 DCHECK(target_message_loop_->BelongsToCurrentThread());
72 if (RunOnTargetThreadAsync()) 72 if (RunOnTargetThreadAsync())
73 original_message_loop()->PostTask( 73 original_task_runner()->PostTask(
74 FROM_HERE, 74 FROM_HERE,
75 base::Bind(&QuotaThreadTask::CallCompleted, this)); 75 base::Bind(&QuotaThreadTask::CallCompleted, this));
76 } 76 }
77 77
78 bool QuotaThreadTask::RunOnTargetThreadAsync() { 78 bool QuotaThreadTask::RunOnTargetThreadAsync() {
79 RunOnTargetThread(); 79 RunOnTargetThread();
80 return true; 80 return true;
81 } 81 }
82 82
83 void QuotaThreadTask::RunOnTargetThread() { 83 void QuotaThreadTask::RunOnTargetThread() {
(...skipping 13 matching lines...) Expand all
97 void QuotaTaskObserver::RegisterTask(QuotaTask* task) { 97 void QuotaTaskObserver::RegisterTask(QuotaTask* task) {
98 running_quota_tasks_.insert(task); 98 running_quota_tasks_.insert(task);
99 } 99 }
100 100
101 void QuotaTaskObserver::UnregisterTask(QuotaTask* task) { 101 void QuotaTaskObserver::UnregisterTask(QuotaTask* task) {
102 DCHECK(running_quota_tasks_.find(task) != running_quota_tasks_.end()); 102 DCHECK(running_quota_tasks_.find(task) != running_quota_tasks_.end());
103 running_quota_tasks_.erase(task); 103 running_quota_tasks_.erase(task);
104 } 104 }
105 105
106 } // namespace quota 106 } // namespace quota
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698