Add CompletionTask to PPAPI TrackedCallback.

ppapi/shared_impl/tracked_callback.cc

Index: ppapi/shared_impl/tracked_callback.cc
diff --git a/ppapi/shared_impl/tracked_callback.cc b/ppapi/shared_impl/tracked_callback.cc
index 854e9dfb1509ebb843cdbc9633b1c6aca5371f5a..1a3ac21adb5610b332f617b3c10b13f1ec74acf2 100644
--- a/ppapi/shared_impl/tracked_callback.cc
+++ b/ppapi/shared_impl/tracked_callback.cc
@@ -27,6 +27,14 @@ bool IsMainThread() {
       PpapiGlobals::Get()->GetMainThreadMessageLoop()->BelongsToCurrentThread();
 }
 
+int32_t RunCompletionTask(TrackedCallback::CompletionTask completion_task,
+                          int32_t result) {
+  int32_t task_result = completion_task.Run(result);
+  if (result != PP_ERROR_ABORTED)
+    result = task_result;
+  return result;
+}
+
 }  // namespace
 
 // TrackedCallback -------------------------------------------------------------
@@ -128,11 +136,18 @@ void TrackedCallback::Run(int32_t result) {
       PostRun(result);
       return;
     }
-    // Copy |callback_| now, since |MarkAsCompleted()| may delete us.
+
+    // Copy callback fields now, since |MarkAsCompleted()| may delete us.
     PP_CompletionCallback callback = callback_;
-    // Do this before running the callback in case of reentrancy (which
-    // shouldn't happen, but avoid strange failures).
+    CompletionTask completion_task = completion_task_;
+    completion_task_.Reset();
+    // Do this before running the callback in case of reentrancy from running
+    // the completion task.
     MarkAsCompleted();
+
+    if (!completion_task.is_null())
+      result = RunCompletionTask(completion_task, result);
+
     // TODO(dmichael): Associate a message loop with the callback; if it's not
     // the same as the current thread's loop, then post it to the right loop.
     CallWhileUnlocked(PP_RunCompletionCallback, &callback, result);
@@ -164,6 +179,12 @@ void TrackedCallback::PostRun(int32_t result) {
   is_scheduled_ = true;
 }
 
+void TrackedCallback::set_completion_task(
+    const CompletionTask& completion_task) {
+  DCHECK(completion_task_.is_null());
+  completion_task_ = completion_task;
+}
+
 // static
 bool TrackedCallback::IsPending(
     const scoped_refptr<TrackedCallback>& callback) {
@@ -195,6 +216,12 @@ int32_t TrackedCallback::BlockUntilComplete() {
 
   while (!completed())
     operation_completed_condvar_->Wait();
+
+  if (!completion_task_.is_null()) {
+    result_for_blocked_callback_ =
+        RunCompletionTask(completion_task_, result_for_blocked_callback_);
+    completion_task_.Reset();
+  }
   return result_for_blocked_callback_;
 }