Use console.log to report NaCl errors in Chrome instead of alerts

src/trusted/plugin/npapi/browser_impl_npapi.cc

 /*
  * Copyright 2008 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.
  */
 
 
 // Portable interface for browser interaction - NPAPI implementation
 
 #include "native_client/src/trusted/plugin/npapi/browser_impl_npapi.h"
@@ skipping 92 matching lines @@
   } while (0);
 
   // Free the dummy return from the evaluate.
   NPN_ReleaseVariantValue(&dummy_return);
   // Free the string copy we allocated in CopyToNPString.
   FreeNPString(&str);
 
   return true;
 }
 
+bool BrowserImplNpapi::AddToConsole(InstanceIdentifier instance_id,
+                                    const nacl::string& text) {
+#if defined(NACL_STANDALONE)
+  // We cannot be sure whether console.log is supported by the browser,
+  // so we use alerts instead.
+  return Alert(instance_id, text);
+#else
+  bool success = false;
+  // Usually these messages are important enough to call attention to them.
+  puts(text.c_str());
+
+  NPObject* window = NULL;
+  NPP npp = InstanceIdentifierToNPP(instance_id);
+  if (NPN_GetValue(npp, NPNVWindowNPObject, &window) != NPERR_NO_ERROR) {
+    return false;
+  }
+
+  NPVariant console_variant;
+  VOID_TO_NPVARIANT(console_variant);

[Mark Seaborn, 2010/08/20 18:45:32]

If you're using gotos for cleanup you don't need this line.

+  if (!NPN_GetProperty(npp, window, NPN_GetStringIdentifier("console"),
+                       &console_variant)) {
+    goto cleanup_window;
+  }
+  if (!NPVARIANT_IS_OBJECT(console_variant)) {
+    goto cleanup_console_variant;
+  }
+  NPObject* console_object = NPVARIANT_TO_OBJECT(console_variant);
+
+  NPVariant message;  // doesn't hold its own string data, so don't release
+  STRINGN_TO_NPVARIANT(text.c_str(),
+                       static_cast<uint32_t>(text.size()),
+                       message);
+
+  NPVariant result;
+  VOID_TO_NPVARIANT(result);
+  success = NPN_Invoke(npp, console_object, NPN_GetStringIdentifier("log"),
+                       &message, 1, &result);
+  if (success) {
+    NPN_ReleaseVariantValue(&result);
+  }
+cleanup_console_variant:
+  NPN_ReleaseVariantValue(&console_variant);
+cleanup_window:
+  NPN_ReleaseObject(window);
+  return success;
+#endif
+}
+
 bool BrowserImplNpapi::Alert(InstanceIdentifier instance_id,
                              const nacl::string& text) {
   // Usually these messages are important enough to call attention to them.
   puts(text.c_str());
 
   NPObject* window;
   NPP npp = InstanceIdentifierToNPP(instance_id);
   if (NPN_GetValue(npp, NPNVWindowNPObject, &window) != NPERR_NO_ERROR) {
     return false;
   }
 
   NPVariant message;  // doesn't hold its own string data, so don't release
   STRINGN_TO_NPVARIANT(text.c_str(),
                        static_cast<uint32_t>(text.size()),
                        message);
 
   NPVariant result;
   VOID_TO_NPVARIANT(result);
   bool ok = NPN_Invoke(npp, window, NPN_GetStringIdentifier("alert"),
                        &message, 1, &result);
   if (ok) NPN_ReleaseVariantValue(&result);
-  // TODO(adonovan): NPN_ReleaseObject(window) needed?
+  NPN_ReleaseObject(window);
   return ok;
 }
 
 bool BrowserImplNpapi::GetFullURL(InstanceIdentifier instance_id,
                                   nacl::string* full_url) {
   NPP npp = InstanceIdentifierToNPP(instance_id);
   NPObject* win_obj = NULL;
   NPVariant loc_value;
   NPVariant href_value;
 
@@ skipping 47 matching lines @@
 
 NPP InstanceIdentifierToNPP(InstanceIdentifier id) {
   return reinterpret_cast<NPP>(assert_cast<intptr_t>(id));
 }
 
 InstanceIdentifier NPPToInstanceIdentifier(NPP npp) {
   return assert_cast<InstanceIdentifier>(reinterpret_cast<intptr_t>(npp));
 }
 
 }  // namespace plugin