PPAPI: Make blocking completion callbacks work.

ppapi/proxy/ppb_core_proxy.cc

 // 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.
 
 #include "ppapi/proxy/ppb_core_proxy.h"
 
 #include <stdlib.h>  // For malloc
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
-#include "base/message_loop.h"
-#include "base/message_loop_proxy.h"
 #include "base/time.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/time_conversion.h"
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
-base::MessageLoopProxy* GetMainThreadMessageLoop() {
-  CR_DEFINE_STATIC_LOCAL(scoped_refptr<base::MessageLoopProxy>, proxy,
-      (base::MessageLoopProxy::current()));
-  return proxy.get();
-}
-
 void AddRefResource(PP_Resource resource) {
   ppapi::ProxyAutoLock lock;
   PpapiGlobals::Get()->GetResourceTracker()->AddRefResource(resource);
 }
 
 void ReleaseResource(PP_Resource resource) {
   ppapi::ProxyAutoLock lock;
   PpapiGlobals::Get()->GetResourceTracker()->ReleaseResource(resource);
 }
 
 double GetTime() {
   return TimeToPPTime(base::Time::Now());
 }
 
 double GetTimeTicks() {
   return TimeTicksToPPTimeTicks(base::TimeTicks::Now());
 }
 
 void CallbackWrapper(PP_CompletionCallback callback, int32_t result) {
   TRACE_EVENT2("ppapi proxy", "CallOnMainThread callback",
                "Func", reinterpret_cast<void*>(callback.func),
                "UserData", callback.user_data);
   CallWhileUnlocked(PP_RunCompletionCallback, &callback, result);
 }
 
 void CallOnMainThread(int delay_in_ms,
                       PP_CompletionCallback callback,
                       int32_t result) {
-  GetMainThreadMessageLoop()->PostDelayedTask(
+  DCHECK(callback.func);
+  if (!callback.func)
+    return;
+  PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostDelayedTask(
       FROM_HERE,
       RunWhileLocked(base::Bind(&CallbackWrapper, callback, result)),
       base::TimeDelta::FromMilliseconds(delay_in_ms));
 }
 
 PP_Bool IsMainThread() {
-  return PP_FromBool(GetMainThreadMessageLoop()->BelongsToCurrentThread());
+  return PP_FromBool(PpapiGlobals::Get()->
+      GetMainThreadMessageLoop()->BelongsToCurrentThread());
 }
 
 const PPB_Core core_interface = {
   &AddRefResource,
   &ReleaseResource,
   &GetTime,
   &GetTimeTicks,
   &CallOnMainThread,
   &IsMainThread
 };
@@ skipping 33 matching lines @@
 void PPB_Core_Proxy::OnMsgAddRefResource(const HostResource& resource) {
   ppb_core_impl_->AddRefResource(resource.host_resource());
 }
 
 void PPB_Core_Proxy::OnMsgReleaseResource(const HostResource& resource) {
   ppb_core_impl_->ReleaseResource(resource.host_resource());
 }
 
 }  // namespace proxy
 }  // namespace ppapi