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

Unified Diff: content/ppapi_plugin/ppapi_thread.cc

Issue 11299147: Pepper proxy: make the browser sender handle the proxy lock properly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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: content/ppapi_plugin/ppapi_thread.cc
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index 7ee63f64f2a8ab14734fe2bccc65dd408f7d59d1..e366b9b312409fdfeb211012b45da03e2814aad5 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc
@@ -73,6 +73,14 @@ PpapiThread::~PpapiThread() {
WebKit::shutdown();
}
+bool PpapiThread::Send(IPC::Message* msg) {
+ // Allow access from multiple threads.
+ if (MessageLoop::current() == message_loop())
+ return ChildThread::Send(msg);
+
+ return sync_message_filter()->Send(msg);
+}
+
// The "regular" ChildThread implements this function and does some standard
// dispatching, then uses the message router. We don't actually need any of
// this so this function just overrides that one.
@@ -154,13 +162,6 @@ std::set<PP_Instance>* PpapiThread::GetGloballySeenInstanceIDSet() {
return &globally_seen_instance_ids_;
}
-bool PpapiThread::SendToBrowser(IPC::Message* msg) {
- if (MessageLoop::current() == message_loop())
- return ChildThread::Send(msg);
-
- return sync_message_filter()->Send(msg);
-}
-
IPC::Sender* PpapiThread::GetBrowserSender() {
return this;
}

Powered by Google App Engine
This is Rietveld 408576698