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