Chrome-side change to support stdout/err to postmessage debug hookup.

ppapi/native_client/src/trusted/plugin/service_runtime.cc

 /*
  * Copyright (c) 2011 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.
  */
 
 #define NACL_LOG_MODULE_NAME "Plugin::ServiceRuntime"
 
 #include "native_client/src/trusted/plugin/service_runtime.h"
 
@@ skipping 16 matching lines @@
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/shared/platform/nacl_sync_raii.h"
 #include "native_client/src/shared/platform/scoped_ptr_refcount.h"
 #include "native_client/src/trusted/desc/nacl_desc_imc.h"
 #include "native_client/src/trusted/desc/nrd_xfer.h"
 #include "native_client/src/trusted/desc/nrd_xfer_effector.h"
 #include "native_client/src/trusted/handle_pass/browser_handle.h"
 #include "native_client/src/trusted/nonnacl_util/sel_ldr_launcher.h"
 
+// browser_interface includes portability.h for uintptr_t etc, but it
+// also transitively includes windows.h, where PostMessage gets
+// defined as a preprocessor symbol
 #include "native_client/src/trusted/plugin/browser_interface.h"
+
 #include "native_client/src/trusted/plugin/manifest.h"
+
+// This is here due to a Windows API collision; plugin.h through
+// file_downloader.h transitively includes Instance.h which defines a
+// PostMessage method, so this undef must appear before any of those.
+#ifdef PostMessage
+#undef PostMessage
+#endif
 #include "native_client/src/trusted/plugin/plugin.h"
 #include "native_client/src/trusted/plugin/plugin_error.h"
 #include "native_client/src/trusted/plugin/scriptable_handle.h"
 #include "native_client/src/trusted/plugin/srpc_client.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"
@@ skipping 41 matching lines @@
   CHECK(continuation != NULL);
   NaClLog(4, "PluginReverseInterface::Log(%s)\n", message.c_str());
   plugin::WeakRefCallOnMainThread(
       anchor_,
       0,  /* delay in ms */
       ALLOW_THIS_IN_INITIALIZER_LIST(this),
       &plugin::PluginReverseInterface::Log_MainThreadContinuation,
       continuation);
 }
 
+void PluginReverseInterface::DoPostMessage(nacl::string message) {
+  PostMessageResource* continuation = new PostMessageResource(message);
+  CHECK(continuation != NULL);
+  NaClLog(4, "PluginReverseInterface::DoPostMessage(%s)\n", message.c_str());
+  plugin::WeakRefCallOnMainThread(
+      anchor_,
+      0,  /* delay in ms */
+      ALLOW_THIS_IN_INITIALIZER_LIST(this),
+      &plugin::PluginReverseInterface::PostMessage_MainThreadContinuation,
+      continuation);
+}
+
 void PluginReverseInterface::StartupInitializationComplete() {
   NaClLog(0, "PluginReverseInterface::StartupInitializationComplete\n");
   if (init_done_cb_.pp_completion_callback().func != NULL) {
     NaClLog(0,
             "PluginReverseInterface::StartupInitializationComplete:"
             " invoking CB\n");
     pp::Module::Get()->core()->CallOnMainThread(0, init_done_cb_, PP_OK);
   } else {
     NaClLog(0,
             "PluginReverseInterface::StartupInitializationComplete:"
             " init_done_cb_ not valid, skipping.\n");
   }
 }
 
 void PluginReverseInterface::Log_MainThreadContinuation(
     LogToJavaScriptConsoleResource* p,
     int32_t err) {
   UNREFERENCED_PARAMETER(err);
   NaClLog(4,
           "PluginReverseInterface::Log_MainThreadContinuation(%s)\n",
           p->message.c_str());
   plugin_->browser_interface()->AddToConsole(static_cast<Plugin*>(plugin_),
                                              p->message);
 }
+void PluginReverseInterface::PostMessage_MainThreadContinuation(
+    PostMessageResource* p,
+    int32_t err) {
+  UNREFERENCED_PARAMETER(err);
+  NaClLog(4,
+          "PluginReverseInterface::PostMessage_MainThreadContinuation(%s)\n",
+          p->message.c_str());
+  plugin_->PostMessage(std::string("DEBUG_POSTMESSAGE:") + p->message);
+}
 
 bool PluginReverseInterface::EnumerateManifestKeys(
     std::set<nacl::string>* out_keys) {
   Manifest const* mp = plugin_->manifest();
 
   if (!mp->GetFileKeys(out_keys)) {
     return false;
   }
 
   return true;
@@ skipping 446 matching lines @@
   nacl::MutexLocker take(&mu_);
   return exit_status_;
 }
 
 void ServiceRuntime::set_exit_status(int exit_status) {
   nacl::MutexLocker take(&mu_);
   exit_status_ = exit_status & 0xff;
 }
 
 }  // namespace plugin