NaCl PPAPI Proxy: wrap up with crash detection. Clean-up handling code to skip remote shutdown ca...

ppapi/native_client/src/trusted/plugin/plugin.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.
  */
 
 #ifdef _MSC_VER
 // Do not warn about use of std::copy with raw pointers.
 #pragma warning(disable : 4996)
 #endif
@@ skipping 454 matching lines @@
 
 static int const kAbiHeaderBuffer = 256;  // must be at least EI_ABIVERSION + 1
 
 void Plugin::LoadMethods() {
   PLUGIN_PRINTF(("Plugin::LoadMethods ()\n"));
   // Properties implemented by Plugin.
   AddPropertyGet(GetReadyStateProperty, "readyState", "i");
 }
 
 bool Plugin::HasMethod(uintptr_t method_id, CallType call_type) {
-  PLUGIN_PRINTF(("Plugin::HasMethod (method_id=%x) = ",
+  PLUGIN_PRINTF(("Plugin::HasMethod (method_id=%x)\n",
                  static_cast<int>(method_id)));
   if (GetMethodInfo(method_id, call_type)) {
     PLUGIN_PRINTF(("true\n"));
     return true;
   }
   if (!ExperimentalJavaScriptApisAreEnabled()) {
     PLUGIN_PRINTF(("false\n"));
     return false;
   }
   if (call_type != METHOD_CALL) {
@@ skipping 812 matching lines @@
                  is_valid_proxy));
   if (!is_valid_proxy) {
     error_info->SetReport(ERROR_START_PROXY_CRASH,
                           "instance crashed after creation.");
   }
   return is_valid_proxy;
 }
 
 void Plugin::ReportDeadNexe() {
   PLUGIN_PRINTF(("Plugin::ReportDeadNexe\n"));
+  if (ppapi_proxy_ != NULL)
+    ppapi_proxy_->ReportDeadNexe();
 
   if (nacl_ready_state() == DONE) {  // After loadEnd.
     int64_t crash_time = NaClGetTimeOfDayMicroseconds();
     // Crashes will be more likely near startup, so use a medium histogram
     // instead of a large one.
     HistogramTimeMedium(
         "NaCl.ModuleUptime.Crash",
         (crash_time - ready_time_) / NACL_MICROS_PER_MILLI);
 
     EnqueueProgressEvent("crash",
                          LENGTH_IS_NOT_COMPUTABLE,
                          kUnknownBytes,
                          kUnknownBytes);
     CHECK(ppapi_proxy_ != NULL && !ppapi_proxy_->is_valid());
     ShutdownProxy();
   }
-  // else LoadNaClModule and NexeFileDidOpen will provide error handling.
+  // else ReportLoadError() and ReportAbortError() will be used by loading code
+  // to provide error handling and proxy shutdown.
+  //
   // NOTE: not all crashes during load will make it here.
   // Those in BrowserPpp::InitializeModule and creation of PPP interfaces
   // will just get reported back as PP_ERROR_FAILED.
 }
 
 void Plugin::ShutdownProxy() {
   PLUGIN_PRINTF(("Plugin::ShutdownProxy (ppapi_proxy=%p)\n",
                 static_cast<void*>(ppapi_proxy_)));
   // We do not call remote PPP_Instance::DidDestroy because the untrusted
   // side can no longer take full advantage of mostly asynchronous Pepper
   // per-Instance interfaces at this point.
-  if (BrowserPpp::is_valid(ppapi_proxy_))
+  if (ppapi_proxy_ != NULL) {
     ppapi_proxy_->ShutdownModule();
-  delete ppapi_proxy_;
-  ppapi_proxy_ = NULL;
+    delete ppapi_proxy_;
+    ppapi_proxy_ = NULL;
+  }
 }
 
 void Plugin::NaClManifestBufferReady(int32_t pp_error) {
   PLUGIN_PRINTF(("Plugin::NaClManifestBufferReady (pp_error=%"
                  NACL_PRId32")\n", pp_error));
   ErrorInfo error_info;
   set_manifest_url(nexe_downloader_.url());
   if (pp_error != PP_OK) {
     if (pp_error == PP_ERROR_ABORTED) {
       ReportLoadAbort();
@@ skipping 510 matching lines @@
   std::string scheme = canonicalized.AsString().substr(comps.scheme.begin,
                                                        comps.scheme.len);
   if (scheme == kChromeExtensionUriScheme)
     return SCHEME_CHROME_EXTENSION;
   if (scheme == kDataUriScheme)
     return SCHEME_DATA;
   return SCHEME_OTHER;
 }
 
 }  // namespace plugin