diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-23 14:27:42 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-23 14:27:42 +0000 |
| commit | aed965375dec978e7feb8722b1b94250a2a6e039 (patch) | |
| tree | 9f8ccdf7a3902fa1db54e0c036f7cb9ca96775fb /ppapi/proxy/ppb_broker_proxy.cc | |
| parent | 94bd0a2e94c1f07ccc0236a95e57a2e16b94038a (diff) | |
| download | chromium_src-aed965375dec978e7feb8722b1b94250a2a6e039.zip chromium_src-aed965375dec978e7feb8722b1b94250a2a6e039.tar.gz chromium_src-aed965375dec978e7feb8722b1b94250a2a6e039.tar.bz2 | |
PPAPI: Make blocking completion callbacks work.
This also makes scoped_refptr<TrackedCallback> the "new" way to pass completion callbacks in an API. This allows the Enter object to handle checking for blocking callbacks on the main thread to report error, and blocking if on the background thread. This way, interfaces don't have to write any special cases for blocking callbacks.
When built with enable_pepper_threading=1 locally, URLLoader tests all pass for blocking completion callbacks. I haven't updated all tests yet.
BUG=92909
TEST=
Review URL: https://chromiumcodereview.appspot.com/10081020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143806 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/ppb_broker_proxy.cc')
| -rw-r--r-- | ppapi/proxy/ppb_broker_proxy.cc | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ppapi/proxy/ppb_broker_proxy.cc b/ppapi/proxy/ppb_broker_proxy.cc index b9549e0..9800d32 100644 --- a/ppapi/proxy/ppb_broker_proxy.cc +++ b/ppapi/proxy/ppb_broker_proxy.cc @@ -33,7 +33,8 @@ class Broker : public PPB_Broker_API, public Resource { virtual PPB_Broker_API* AsPPB_Broker_API() OVERRIDE; // PPB_Broker_API implementation. - virtual int32_t Connect(PP_CompletionCallback connect_callback) OVERRIDE; + virtual int32_t Connect( + scoped_refptr<TrackedCallback> connect_callback) OVERRIDE; virtual int32_t GetHandle(int32_t* handle) OVERRIDE; // Called by the proxy when the host side has completed the request. @@ -67,18 +68,13 @@ PPB_Broker_API* Broker::AsPPB_Broker_API() { return this; } -int32_t Broker::Connect(PP_CompletionCallback connect_callback) { - if (!connect_callback.func) { - // Synchronous calls are not supported. - return PP_ERROR_BLOCKS_MAIN_THREAD; - } - +int32_t Broker::Connect(scoped_refptr<TrackedCallback> connect_callback) { if (TrackedCallback::IsPending(current_connect_callback_)) return PP_ERROR_INPROGRESS; else if (called_connect_) return PP_ERROR_FAILED; - current_connect_callback_ = new TrackedCallback(this, connect_callback); + current_connect_callback_ = connect_callback; called_connect_ = true; bool success = PluginDispatcher::GetForResource(this)->Send( |