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

Side by Side Diff: content/public/browser/browser_message_filter.cc

Issue 9111032: Change over IgnoreReturn to IgnoreResult. remove IgnoreReturn. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix it for realz Created 8 years, 11 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) 2011 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 "content/public/browser/browser_message_filter.h" 5 #include "content/public/browser/browser_message_filter.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/process.h" 10 #include "base/process.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 // but it seems better to not allow sending synchronous messages from the 46 // but it seems better to not allow sending synchronous messages from the
47 // browser, since it might allow a corrupt/malicious renderer to hang us. 47 // browser, since it might allow a corrupt/malicious renderer to hang us.
48 NOTREACHED() << "Can't send sync message through BrowserMessageFilter!"; 48 NOTREACHED() << "Can't send sync message through BrowserMessageFilter!";
49 return false; 49 return false;
50 } 50 }
51 51
52 if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { 52 if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
53 BrowserThread::PostTask( 53 BrowserThread::PostTask(
54 BrowserThread::IO, 54 BrowserThread::IO,
55 FROM_HERE, 55 FROM_HERE,
56 base::IgnoreReturn<bool>( 56 base::Bind(base::IgnoreResult(&BrowserMessageFilter::Send), this,
57 base::Bind(&BrowserMessageFilter::Send, this, message))); 57 message));
58 return true; 58 return true;
59 } 59 }
60 60
61 if (channel_) 61 if (channel_)
62 return channel_->Send(message); 62 return channel_->Send(message);
63 63
64 delete message; 64 delete message;
65 return false; 65 return false;
66 } 66 }
67 67
68 void BrowserMessageFilter::OverrideThreadForMessage(const IPC::Message& message, 68 void BrowserMessageFilter::OverrideThreadForMessage(const IPC::Message& message,
69 BrowserThread::ID* thread) { 69 BrowserThread::ID* thread) {
70 } 70 }
71 71
72 bool BrowserMessageFilter::OnMessageReceived(const IPC::Message& message) { 72 bool BrowserMessageFilter::OnMessageReceived(const IPC::Message& message) {
73 BrowserThread::ID thread = BrowserThread::IO; 73 BrowserThread::ID thread = BrowserThread::IO;
74 OverrideThreadForMessage(message, &thread); 74 OverrideThreadForMessage(message, &thread);
75 if (thread == BrowserThread::IO) 75 if (thread == BrowserThread::IO)
76 return DispatchMessage(message); 76 return DispatchMessage(message);
77 77
78 if (thread == BrowserThread::UI && !CheckCanDispatchOnUI(message, this)) 78 if (thread == BrowserThread::UI && !CheckCanDispatchOnUI(message, this))
79 return true; 79 return true;
80 80
81 BrowserThread::PostTask( 81 BrowserThread::PostTask(
82 thread, FROM_HERE, 82 thread, FROM_HERE,
83 base::IgnoreReturn<bool>( 83 base::Bind(base::IgnoreResult(&BrowserMessageFilter::DispatchMessage),
84 base::Bind(&BrowserMessageFilter::DispatchMessage, this, message))); 84 this, message));
85 return true; 85 return true;
86 } 86 }
87 87
88 bool BrowserMessageFilter::DispatchMessage(const IPC::Message& message) { 88 bool BrowserMessageFilter::DispatchMessage(const IPC::Message& message) {
89 bool message_was_ok = true; 89 bool message_was_ok = true;
90 bool rv = OnMessageReceived(message, &message_was_ok); 90 bool rv = OnMessageReceived(message, &message_was_ok);
91 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO) || rv) << 91 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO) || rv) <<
92 "Must handle messages that were dispatched to another thread!"; 92 "Must handle messages that were dispatched to another thread!";
93 if (!message_was_ok) { 93 if (!message_was_ok) {
94 content::RecordAction(UserMetricsAction("BadMessageTerminate_BMF")); 94 content::RecordAction(UserMetricsAction("BadMessageTerminate_BMF"));
(...skipping 27 matching lines...) Expand all
122 IPC::Message* reply = IPC::SyncMessage::GenerateReply(&message); 122 IPC::Message* reply = IPC::SyncMessage::GenerateReply(&message);
123 reply->set_reply_error(); 123 reply->set_reply_error();
124 sender->Send(reply); 124 sender->Send(reply);
125 return false; 125 return false;
126 } 126 }
127 #endif 127 #endif
128 return true; 128 return true;
129 } 129 }
130 130
131 } // namespace content 131 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/utility_process_host.cc ('k') | content/renderer/media/audio_input_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698