typesafe call-on-main-thread interface. no cast to/from void* required.

src/trusted/plugin/service_runtime.cc

 /*
  * Copyright (c) 2011 The Native Client 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 "native_client/src/trusted/plugin/service_runtime.h"
 
 #include <utility>
 #include <map>
@@ skipping 14 matching lines @@
 
 #include "native_client/src/trusted/plugin/browser_interface.h"
 #include "native_client/src/trusted/plugin/connected_socket.h"
 #include "native_client/src/trusted/plugin/plugin.h"
 #include "native_client/src/trusted/plugin/scriptable_handle.h"
 #include "native_client/src/trusted/plugin/shared_memory.h"
 #include "native_client/src/trusted/plugin/socket_address.h"
 #include "native_client/src/trusted/plugin/srt_socket.h"
 #include "native_client/src/trusted/plugin/utility.h"
 
+#include "native_client/src/trusted/weak_ref/call_on_main_thread.h"
+
 #include "native_client/src/trusted/service_runtime/nacl_error_code.h"
 #include "native_client/src/trusted/service_runtime/include/sys/nacl_imc_api.h"
 
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/core.h"
 #include "ppapi/cpp/completion_callback.h"
 
 using std::vector;
 
 namespace plugin {
 
 typedef std::pair<Plugin*, nacl::string> LogCallbackData;
 
 struct LogToJavaScriptConsoleResource {
  public:
   LogToJavaScriptConsoleResource(std::string msg, Plugin* plugin_ptr)
       : message(msg),
         plugin(plugin_ptr) {}
   std::string message;
   Plugin* plugin;
 };
 
 // Must be called on the main thread.
-void LogToJavaScriptConsole(nacl::WeakRef<LogToJavaScriptConsoleResource>* wr,
+void LogToJavaScriptConsole(LogToJavaScriptConsoleResource* p,
                             int32_t err) {
   UNREFERENCED_PARAMETER(err);
-  nacl::scoped_ptr<LogToJavaScriptConsoleResource> p;
-  wr->ReleaseAndUnref(&p);
-  if (p == NULL) {
-    NaClLog(1, "LogToJavaScriptConsole: Weak ref died\n");
-    return;
-  }
-  NaClLog(1, "LogToJavaScriptConsole: Weak ref okay: %p\n",
-          reinterpret_cast<void*>(p.get()));
   p->plugin->browser_interface()->AddToConsole(p->plugin->instance_id(),
                                                p->message);
 }
 
 void PluginReverseInterface::Log(nacl::string message) {
-  (void) WeakRefCompletionCallback(anchor_, 0,
-                                   LogToJavaScriptConsole,
-                                   new LogToJavaScriptConsoleResource(
-                                       message, plugin_));
+  (void) plugin::WeakRefCallOnMainThread(
+      anchor_,
+      0,  /* delay in ms */
+      LogToJavaScriptConsole,
+      new LogToJavaScriptConsoleResource(
+          message, plugin_));
 }
 
 ServiceRuntime::ServiceRuntime(Plugin* plugin)
     : default_socket_address_(NULL),
       plugin_(plugin),
       browser_interface_(plugin->browser_interface()),
       runtime_channel_(NULL),
       reverse_service_(NULL),
       subprocess_(NULL),
       async_receive_desc_(NULL),
@@ skipping 312 matching lines @@
       SocketAddress::New(plugin, descs[0]));
  cleanup:
   // TODO(sehr,mseaborn): use scoped_ptr for management of DescWrappers.
   delete imc_desc;
   PLUGIN_PRINTF(("ServiceRuntime::GetSocketAddress (return %p)\n",
                  static_cast<void*>(retval)));
   return retval;
 }
 
 }  // namespace plugin