OLD | NEW |
1 // Copyright (c) 2012 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 "ppapi/host/resource_message_filter.h" | 5 #include "ppapi/host/resource_message_filter.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/location.h" |
9 #include "base/message_loop/message_loop_proxy.h" | 9 #include "base/single_thread_task_runner.h" |
10 #include "base/task_runner.h" | 10 #include "base/task_runner.h" |
| 11 #include "base/thread_task_runner_handle.h" |
11 #include "ipc/ipc_message.h" | 12 #include "ipc/ipc_message.h" |
12 #include "ppapi/c/pp_errors.h" | 13 #include "ppapi/c/pp_errors.h" |
13 #include "ppapi/host/ppapi_host.h" | 14 #include "ppapi/host/ppapi_host.h" |
14 #include "ppapi/host/resource_host.h" | 15 #include "ppapi/host/resource_host.h" |
15 | 16 |
16 namespace ppapi { | 17 namespace ppapi { |
17 namespace host { | 18 namespace host { |
18 | 19 |
19 namespace internal { | 20 namespace internal { |
20 | 21 |
21 // static | 22 // static |
22 void ResourceMessageFilterDeleteTraits::Destruct( | 23 void ResourceMessageFilterDeleteTraits::Destruct( |
23 const ResourceMessageFilter* filter) { | 24 const ResourceMessageFilter* filter) { |
24 if (!filter->deletion_message_loop_proxy_->BelongsToCurrentThread()) { | 25 if (!filter->deletion_task_runner_->BelongsToCurrentThread()) { |
25 // During shutdown the object may not be deleted, but it should be okay to | 26 // During shutdown the object may not be deleted, but it should be okay to |
26 // leak in that case. | 27 // leak in that case. |
27 filter->deletion_message_loop_proxy_->DeleteSoon(FROM_HERE, filter); | 28 filter->deletion_task_runner_->DeleteSoon(FROM_HERE, filter); |
28 } else { | 29 } else { |
29 delete filter; | 30 delete filter; |
30 } | 31 } |
31 } | 32 } |
32 | 33 |
33 } // namespace internal | 34 } // namespace internal |
34 | 35 |
35 ResourceMessageFilter::ResourceMessageFilter() | 36 ResourceMessageFilter::ResourceMessageFilter() |
36 : deletion_message_loop_proxy_( | 37 : deletion_task_runner_( |
37 base::MessageLoop::current()->message_loop_proxy()), | 38 base::ThreadTaskRunnerHandle::Get()), |
38 reply_thread_message_loop_proxy_( | 39 reply_thread_task_runner_( |
39 base::MessageLoop::current()->message_loop_proxy()), | 40 base::ThreadTaskRunnerHandle::Get()), |
40 resource_host_(NULL) { | 41 resource_host_(NULL) { |
41 } | 42 } |
42 | 43 |
43 ResourceMessageFilter::ResourceMessageFilter( | 44 ResourceMessageFilter::ResourceMessageFilter( |
44 scoped_refptr<base::MessageLoopProxy> reply_thread_message_loop_proxy) | 45 scoped_refptr<base::SingleThreadTaskRunner> reply_thread_task_runner) |
45 : deletion_message_loop_proxy_( | 46 : deletion_task_runner_( |
46 base::MessageLoop::current()->message_loop_proxy()), | 47 base::ThreadTaskRunnerHandle::Get()), |
47 reply_thread_message_loop_proxy_(reply_thread_message_loop_proxy), | 48 reply_thread_task_runner_(reply_thread_task_runner), |
48 resource_host_(NULL) { | 49 resource_host_(NULL) { |
49 } | 50 } |
50 | 51 |
51 ResourceMessageFilter::~ResourceMessageFilter() { | 52 ResourceMessageFilter::~ResourceMessageFilter() { |
52 } | 53 } |
53 | 54 |
54 void ResourceMessageFilter::OnFilterAdded(ResourceHost* resource_host) { | 55 void ResourceMessageFilter::OnFilterAdded(ResourceHost* resource_host) { |
55 resource_host_ = resource_host; | 56 resource_host_ = resource_host; |
56 } | 57 } |
57 | 58 |
(...skipping 16 matching lines...) Expand all Loading... |
74 &ResourceMessageFilter::DispatchMessage, this, msg, context_copy)); | 75 &ResourceMessageFilter::DispatchMessage, this, msg, context_copy)); |
75 } | 76 } |
76 return true; | 77 return true; |
77 } | 78 } |
78 | 79 |
79 return false; | 80 return false; |
80 } | 81 } |
81 | 82 |
82 void ResourceMessageFilter::SendReply(const ReplyMessageContext& context, | 83 void ResourceMessageFilter::SendReply(const ReplyMessageContext& context, |
83 const IPC::Message& msg) { | 84 const IPC::Message& msg) { |
84 if (!reply_thread_message_loop_proxy_->BelongsToCurrentThread()) { | 85 if (!reply_thread_task_runner_->BelongsToCurrentThread()) { |
85 reply_thread_message_loop_proxy_->PostTask(FROM_HERE, | 86 reply_thread_task_runner_->PostTask( |
| 87 FROM_HERE, |
86 base::Bind(&ResourceMessageFilter::SendReply, this, context, msg)); | 88 base::Bind(&ResourceMessageFilter::SendReply, this, context, msg)); |
87 return; | 89 return; |
88 } | 90 } |
89 if (resource_host_) | 91 if (resource_host_) |
90 resource_host_->SendReply(context, msg); | 92 resource_host_->SendReply(context, msg); |
91 } | 93 } |
92 | 94 |
93 scoped_refptr<base::TaskRunner> | 95 scoped_refptr<base::TaskRunner> |
94 ResourceMessageFilter::OverrideTaskRunnerForMessage(const IPC::Message& msg) { | 96 ResourceMessageFilter::OverrideTaskRunnerForMessage(const IPC::Message& msg) { |
95 return NULL; | 97 return NULL; |
96 } | 98 } |
97 | 99 |
98 void ResourceMessageFilter::DispatchMessage(const IPC::Message& msg, | 100 void ResourceMessageFilter::DispatchMessage(const IPC::Message& msg, |
99 HostMessageContext context) { | 101 HostMessageContext context) { |
100 RunMessageHandlerAndReply(msg, &context); | 102 RunMessageHandlerAndReply(msg, &context); |
101 } | 103 } |
102 | 104 |
103 } // namespace host | 105 } // namespace host |
104 } // namespace ppapi | 106 } // namespace ppapi |
OLD | NEW |