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

1 files changed, 10 insertions, 5 deletions

diff --git a/ppapi/thunk/ppb_url_loader_api.h b/ppapi/thunk/ppb_url_loader_api.h
index 5f9e58d..be61166 100644
--- a/ppapi/thunk/ppb_url_loader_api.h
+++ b/ppapi/thunk/ppb_url_loader_api.h
@@ -1,14 +1,18 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef PPAPI_THUNK_URL_LOADER_API_H_
 #define PPAPI_THUNK_URL_LOADER_API_H_
 
+#include "base/memory/ref_counted.h"
 #include "ppapi/c/ppb_url_loader.h"
 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
 
 namespace ppapi {
+
+class TrackedCallback;
+
 namespace thunk {
 
 class PPB_URLLoader_API {
@@ -16,8 +20,8 @@ class PPB_URLLoader_API {
   virtual ~PPB_URLLoader_API() {}
 
   virtual int32_t Open(PP_Resource request_id,
-                       PP_CompletionCallback callback) = 0;
-  virtual int32_t FollowRedirect(PP_CompletionCallback callback) = 0;
+                       scoped_refptr<TrackedCallback> callback) = 0;
+  virtual int32_t FollowRedirect(scoped_refptr<TrackedCallback> callback) = 0;
   virtual PP_Bool GetUploadProgress(int64_t* bytes_sent,
                                     int64_t* total_bytes_to_be_sent) = 0;
   virtual PP_Bool GetDownloadProgress(int64_t* bytes_received,
@@ -25,8 +29,9 @@ class PPB_URLLoader_API {
   virtual PP_Resource GetResponseInfo() = 0;
   virtual int32_t ReadResponseBody(void* buffer,
                                    int32_t bytes_to_read,
-                                   PP_CompletionCallback callback) = 0;
-  virtual int32_t FinishStreamingToFile(PP_CompletionCallback callback) = 0;
+                                   scoped_refptr<TrackedCallback> callback) = 0;
+  virtual int32_t FinishStreamingToFile(
+      scoped_refptr<TrackedCallback> callback) = 0;
   virtual void Close() = 0;
 
   // Trusted API.