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/thunk/ppb_host_resolver_private_thunk.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/thunk/ppb_host_resolver_private_thunk.cc')
| -rw-r--r-- | ppapi/thunk/ppb_host_resolver_private_thunk.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ppapi/thunk/ppb_host_resolver_private_thunk.cc b/ppapi/thunk/ppb_host_resolver_private_thunk.cc index 2de4dd0..9da6656 100644 --- a/ppapi/thunk/ppb_host_resolver_private_thunk.cc +++ b/ppapi/thunk/ppb_host_resolver_private_thunk.cc @@ -4,6 +4,7 @@ #include "ppapi/c/pp_var.h" #include "ppapi/c/private/ppb_host_resolver_private.h" +#include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_host_resolver_private_api.h" #include "ppapi/thunk/resource_creation_api.h" @@ -36,7 +37,8 @@ int32_t Resolve(PP_Resource host_resolver, EnterHostResolver enter(host_resolver, callback, true); if (enter.failed()) return enter.retval(); - return enter.SetResult(enter.object()->Resolve(host, port, hint, callback)); + return enter.SetResult(enter.object()->Resolve(host, port, hint, + enter.callback())); } PP_Var GetCanonicalName(PP_Resource host_resolver) { |