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

Unified Diff: components/nacl/renderer/pnacl_translation_resource_host.cc

Issue 1142063003: content/child: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 5 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 side-by-side diff with in-line comments
Download patch
Index: components/nacl/renderer/pnacl_translation_resource_host.cc
diff --git a/components/nacl/renderer/pnacl_translation_resource_host.cc b/components/nacl/renderer/pnacl_translation_resource_host.cc
index f47f1d40ec5c50c2dc0c72393cbf620afb8dbeea..a4079c1800ba49062fcb87938b9890406064d860 100644
--- a/components/nacl/renderer/pnacl_translation_resource_host.cc
+++ b/components/nacl/renderer/pnacl_translation_resource_host.cc
@@ -11,32 +11,33 @@
using ppapi::PpapiGlobals;
PnaclTranslationResourceHost::PnaclTranslationResourceHost(
- const scoped_refptr<base::MessageLoopProxy>& io_message_loop)
- : io_message_loop_(io_message_loop), sender_(NULL) {}
+ scoped_refptr<base::SingleThreadTaskRunner> io_task_runner)
no sievers 2015/05/20 23:02:38 nit: const ref as before
Sami 2015/05/21 11:39:48 I changed these to pass-by-value since Dana asked
+ : io_task_runner_(io_task_runner), sender_(NULL) {
+}
PnaclTranslationResourceHost::~PnaclTranslationResourceHost() {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(io_task_runner_->BelongsToCurrentThread());
CleanupCacheRequests();
}
void PnaclTranslationResourceHost::OnFilterAdded(IPC::Sender* sender) {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(io_task_runner_->BelongsToCurrentThread());
sender_ = sender;
}
void PnaclTranslationResourceHost::OnFilterRemoved() {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(io_task_runner_->BelongsToCurrentThread());
sender_ = NULL;
}
void PnaclTranslationResourceHost::OnChannelClosing() {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(io_task_runner_->BelongsToCurrentThread());
sender_ = NULL;
}
bool PnaclTranslationResourceHost::OnMessageReceived(
const IPC::Message& message) {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(io_task_runner_->BelongsToCurrentThread());
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(PnaclTranslationResourceHost, message)
IPC_MESSAGE_HANDLER(NaClViewMsg_NexeTempFileReply, OnNexeTempFileReply)
@@ -52,14 +53,10 @@ void PnaclTranslationResourceHost::RequestNexeFd(
RequestNexeFdCallback callback) {
DCHECK(PpapiGlobals::Get()->
GetMainThreadMessageLoop()->BelongsToCurrentThread());
- io_message_loop_->PostTask(
+ io_task_runner_->PostTask(
FROM_HERE,
- base::Bind(&PnaclTranslationResourceHost::SendRequestNexeFd,
- this,
- render_view_id,
- instance,
- cache_info,
- callback));
+ base::Bind(&PnaclTranslationResourceHost::SendRequestNexeFd, this,
+ render_view_id, instance, cache_info, callback));
return;
}
@@ -68,7 +65,7 @@ void PnaclTranslationResourceHost::SendRequestNexeFd(
PP_Instance instance,
const nacl::PnaclCacheInfo& cache_info,
RequestNexeFdCallback callback) {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(io_task_runner_->BelongsToCurrentThread());
if (!sender_ || !sender_->Send(new NaClHostMsg_NexeTempFileRequest(
render_view_id, instance, cache_info))) {
PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
@@ -87,19 +84,17 @@ void PnaclTranslationResourceHost::ReportTranslationFinished(
PP_Bool success) {
DCHECK(PpapiGlobals::Get()->
GetMainThreadMessageLoop()->BelongsToCurrentThread());
- io_message_loop_->PostTask(
+ io_task_runner_->PostTask(
FROM_HERE,
base::Bind(&PnaclTranslationResourceHost::SendReportTranslationFinished,
- this,
- instance,
- success));
+ this, instance, success));
return;
}
void PnaclTranslationResourceHost::SendReportTranslationFinished(
PP_Instance instance,
PP_Bool success) {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(io_task_runner_->BelongsToCurrentThread());
// If the sender is closed or we have been detached, we are probably shutting
// down, so just don't send anything.
if (!sender_)
@@ -113,7 +108,7 @@ void PnaclTranslationResourceHost::OnNexeTempFileReply(
PP_Instance instance,
bool is_hit,
IPC::PlatformFileForTransit file) {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(io_task_runner_->BelongsToCurrentThread());
base::File base_file = IPC::PlatformFileForTransitToFile(file);
CacheRequestInfoMap::iterator it = pending_cache_requests_.find(instance);
if (!base_file.IsValid()) {
@@ -136,7 +131,7 @@ void PnaclTranslationResourceHost::OnNexeTempFileReply(
}
void PnaclTranslationResourceHost::CleanupCacheRequests() {
- DCHECK(io_message_loop_->BelongsToCurrentThread());
+ DCHECK(io_task_runner_->BelongsToCurrentThread());
for (CacheRequestInfoMap::iterator it = pending_cache_requests_.begin();
it != pending_cache_requests_.end();
++it) {

Powered by Google App Engine
This is Rietveld 408576698