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

Unified Diff: ppapi/proxy/resource_reply_thread_registrar.h

Issue 869883003: Never lock the Pepper proxy lock on the IO thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix size_t vs int32_t Created 5 years, 9 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
« no previous file with comments | « ppapi/proxy/resource_message_filter.h ('k') | ppapi/proxy/resource_reply_thread_registrar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/proxy/resource_reply_thread_registrar.h
diff --git a/ppapi/proxy/resource_reply_thread_registrar.h b/ppapi/proxy/resource_reply_thread_registrar.h
index ded54e9de3d90850122c9404fbef7e61d528e1bd..38d596bedb2bdb80b89a363bef15a3a2b4e9e6f4 100644
--- a/ppapi/proxy/resource_reply_thread_registrar.h
+++ b/ppapi/proxy/resource_reply_thread_registrar.h
@@ -47,13 +47,6 @@ class PPAPI_PROXY_EXPORT ResourceReplyThreadRegistrar
scoped_refptr<TrackedCallback> reply_thread_hint);
void Unregister(PP_Resource resource);
- // This results in Resource::OnReplyReceived() for the specified message type
- // to be called on the IO thread directly, while holding the Pepper proxy
- // lock.
- void HandleOnIOThread(uint32 nested_msg_type);
-
- // This method returns NULL if the target thread is the IO thread (because
- // that is the thread on which this method is supposed to be called).
scoped_refptr<base::MessageLoopProxy> GetTargetThread(
const ResourceMessageReplyParams& reply_params,
const IPC::Message& nested_msg);
@@ -72,7 +65,6 @@ class PPAPI_PROXY_EXPORT ResourceReplyThreadRegistrar
// holding |lock_|, otherwise we will cause deadlock.
base::Lock lock_;
ResourceMap map_;
- std::set<uint32> io_thread_message_types_;
scoped_refptr<base::MessageLoopProxy> main_thread_;
DISALLOW_COPY_AND_ASSIGN(ResourceReplyThreadRegistrar);
« no previous file with comments | « ppapi/proxy/resource_message_filter.h ('k') | ppapi/proxy/resource_reply_thread_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698