| OLD | NEW |
| 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/browser/browser_message_filter.h" | 5 #include "content/browser/browser_message_filter.h" |
| 6 | 6 |
| 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" |
| 7 #include "base/logging.h" | 9 #include "base/logging.h" |
| 8 #include "base/process.h" | 10 #include "base/process.h" |
| 9 #include "base/process_util.h" | 11 #include "base/process_util.h" |
| 10 #include "content/browser/user_metrics.h" | 12 #include "content/browser/user_metrics.h" |
| 11 #include "content/public/common/result_codes.h" | 13 #include "content/public/common/result_codes.h" |
| 12 #include "ipc/ipc_sync_message.h" | 14 #include "ipc/ipc_sync_message.h" |
| 13 | 15 |
| 14 using content::BrowserThread; | 16 using content::BrowserThread; |
| 15 | 17 |
| 16 BrowserMessageFilter::BrowserMessageFilter() | 18 BrowserMessageFilter::BrowserMessageFilter() |
| (...skipping 25 matching lines...) Expand all Loading... |
| 42 // but it seems better to not allow sending synchronous messages from the | 44 // but it seems better to not allow sending synchronous messages from the |
| 43 // browser, since it might allow a corrupt/malicious renderer to hang us. | 45 // browser, since it might allow a corrupt/malicious renderer to hang us. |
| 44 NOTREACHED() << "Can't send sync message through BrowserMessageFilter!"; | 46 NOTREACHED() << "Can't send sync message through BrowserMessageFilter!"; |
| 45 return false; | 47 return false; |
| 46 } | 48 } |
| 47 | 49 |
| 48 if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { | 50 if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { |
| 49 BrowserThread::PostTask( | 51 BrowserThread::PostTask( |
| 50 BrowserThread::IO, | 52 BrowserThread::IO, |
| 51 FROM_HERE, | 53 FROM_HERE, |
| 52 NewRunnableMethod(this, &BrowserMessageFilter::Send, message)); | 54 base::IgnoreReturn<bool>( |
| 55 base::Bind(&BrowserMessageFilter::Send, this, message))); |
| 53 return true; | 56 return true; |
| 54 } | 57 } |
| 55 | 58 |
| 56 if (channel_) | 59 if (channel_) |
| 57 return channel_->Send(message); | 60 return channel_->Send(message); |
| 58 | 61 |
| 59 delete message; | 62 delete message; |
| 60 return false; | 63 return false; |
| 61 } | 64 } |
| 62 | 65 |
| 63 void BrowserMessageFilter::OverrideThreadForMessage(const IPC::Message& message, | 66 void BrowserMessageFilter::OverrideThreadForMessage(const IPC::Message& message, |
| 64 BrowserThread::ID* thread) { | 67 BrowserThread::ID* thread) { |
| 65 } | 68 } |
| 66 | 69 |
| 67 bool BrowserMessageFilter::OnMessageReceived(const IPC::Message& message) { | 70 bool BrowserMessageFilter::OnMessageReceived(const IPC::Message& message) { |
| 68 BrowserThread::ID thread = BrowserThread::IO; | 71 BrowserThread::ID thread = BrowserThread::IO; |
| 69 OverrideThreadForMessage(message, &thread); | 72 OverrideThreadForMessage(message, &thread); |
| 70 if (thread == BrowserThread::IO) | 73 if (thread == BrowserThread::IO) |
| 71 return DispatchMessage(message); | 74 return DispatchMessage(message); |
| 72 | 75 |
| 73 if (thread == BrowserThread::UI && !CheckCanDispatchOnUI(message, this)) | 76 if (thread == BrowserThread::UI && !CheckCanDispatchOnUI(message, this)) |
| 74 return true; | 77 return true; |
| 75 | 78 |
| 76 BrowserThread::PostTask( | 79 BrowserThread::PostTask( |
| 77 thread, FROM_HERE, | 80 thread, FROM_HERE, |
| 78 NewRunnableMethod( | 81 base::IgnoreReturn<bool>( |
| 79 this, &BrowserMessageFilter::DispatchMessage, message)); | 82 base::Bind(&BrowserMessageFilter::DispatchMessage, this, message))); |
| 80 return true; | 83 return true; |
| 81 } | 84 } |
| 82 | 85 |
| 83 bool BrowserMessageFilter::DispatchMessage(const IPC::Message& message) { | 86 bool BrowserMessageFilter::DispatchMessage(const IPC::Message& message) { |
| 84 bool message_was_ok = true; | 87 bool message_was_ok = true; |
| 85 bool rv = OnMessageReceived(message, &message_was_ok); | 88 bool rv = OnMessageReceived(message, &message_was_ok); |
| 86 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO) || rv) << | 89 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO) || rv) << |
| 87 "Must handle messages that were dispatched to another thread!"; | 90 "Must handle messages that were dispatched to another thread!"; |
| 88 if (!message_was_ok) { | 91 if (!message_was_ok) { |
| 89 UserMetrics::RecordAction(UserMetricsAction("BadMessageTerminate_BMF")); | 92 UserMetrics::RecordAction(UserMetricsAction("BadMessageTerminate_BMF")); |
| (...skipping 25 matching lines...) Expand all Loading... |
| 115 "messages in the renderer or else deadlocks can occur if the page " | 118 "messages in the renderer or else deadlocks can occur if the page " |
| 116 "has windowed plugins! (message type " << message.type() << ")"; | 119 "has windowed plugins! (message type " << message.type() << ")"; |
| 117 IPC::Message* reply = IPC::SyncMessage::GenerateReply(&message); | 120 IPC::Message* reply = IPC::SyncMessage::GenerateReply(&message); |
| 118 reply->set_reply_error(); | 121 reply->set_reply_error(); |
| 119 sender->Send(reply); | 122 sender->Send(reply); |
| 120 return false; | 123 return false; |
| 121 } | 124 } |
| 122 #endif | 125 #endif |
| 123 return true; | 126 return true; |
| 124 } | 127 } |
| OLD | NEW |