Enhance the PPAPI enter tracking.

ppapi/thunk/enter.cc

Index: ppapi/thunk/enter.cc
diff --git a/ppapi/thunk/enter.cc b/ppapi/thunk/enter.cc
index 7e9f70a7bc78cfb66936ab5d072437fca4a82904..4e304c787b31a1ee0ced37392f3b3b7ca56ef3fa 100644
--- a/ppapi/thunk/enter.cc
+++ b/ppapi/thunk/enter.cc
@@ -4,13 +4,89 @@
 
 #include "ppapi/thunk/enter.h"
 
-#include "base/lazy_instance.h"
+#include "base/bind.H"

[dmichael (off chromium), 2012/01/24 01:05:11]

nit: H->h

+#include "base/logging.h"
+#include "base/message_loop.h"
+#include "ppapi/c/pp_errors.h"
 #include "ppapi/thunk/ppb_instance_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 
 namespace ppapi {
 namespace thunk {
 
+namespace subtle {
+
+bool CallbackIsRequired(const PP_CompletionCallback& callback) {
+  return callback.func != NULL &&
+         (callback.flags & PP_COMPLETIONCALLBACK_FLAG_OPTIONAL) == 0;
+}
+
+EnterBase::EnterBase()
+    : retval_(PP_OK),
+      callback_(PP_BlockUntilComplete()) {
+  // TODO(brettw) validate threads.
+}
+
+EnterBase::EnterBase(const PP_CompletionCallback& callback)
+    : retval_(PP_OK),
+      callback_(CallbackIsRequired(callback) ? callback
+                                             : PP_BlockUntilComplete()) {
+  // TODO(brettw) validate threads.
+}
+
+EnterBase::~EnterBase() {
+  if (callback_.func) {
+    // All async completions should have cleared the callback in SetResult().
+    DCHECK(retval_ != PP_OK_COMPLETIONPENDING && retval_ != PP_OK);
+    MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
+        callback_.func, callback_.user_data, retval_));
+  }
+}
+
+int32_t EnterBase::SetResult(int32_t result) {
+  if (!callback_.func || result == PP_OK_COMPLETIONPENDING) {
+    // Easy case, we don't need to issue the callback (either none is
+    // required, or the implementation will asynchronously issue it
+    // for us), just store the result.
+    callback_ = PP_BlockUntilComplete();
+    retval_ = result;
+    return retval_;
+  }
+
+  // This is a required callback, asynchronously issue it.
+  // TODO(brettw) make this work on different threads, etc.
+  MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
+      callback_.func, callback_.user_data, result));
+
+  // Now that the callback will be issued in the future, we should return
+  // "pending" to the caller, and not issue the callback again.
+  callback_ = PP_BlockUntilComplete();
+  retval_ = PP_OK_COMPLETIONPENDING;
+  return retval_;
+}
+
+FunctionGroupBase* EnterBase::GetFunctions(PP_Instance instance,
+                                           ApiID id) const {
+  return PpapiGlobals::Get()->GetFunctionAPI(instance, id);
+}
+
+Resource* EnterBase::GetResource(PP_Resource resource) const {
+  return PpapiGlobals::Get()->GetResourceTracker()->GetResource(resource);
+}
+
+void EnterBase::ValidateResource(PP_Resource /* pp_resource */,

[dmichael (off chromium), 2012/01/24 01:05:11]

Suggestion: This doesn't do much actual validation; possibly something like
"ReportIfFailed" or something might be a better name.

+                                 Resource* /* resource_base */,
+                                 void* object,
+                                 bool /* report_error */) {

[dmichael (off chromium), 2012/01/24 01:05:11]

This has nothing to do with this CL, but I would love for that bool to change in
to an enum, so the call-sites are more self-documenting. Esp. since writing a
thunk & API for an interface is usually a copy/paste affair.

+  if (object)
+    return;  // Everything worked.
+
+  retval_ = PP_ERROR_BADRESOURCE;
+  // TODO(brettw) log the error.
+}
+
+}  // namespace subtle
+
 EnterResourceCreation::EnterResourceCreation(PP_Instance instance)
     : EnterFunctionNoLock<ResourceCreationAPI>(instance, true) {
 }