Dart: Removes C++ set for closing handles on an unhandled exception.

mojo/dart/embedder/dart_controller.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
@@ skipping 240 matching lines @@
       Dart_LookupLibrary(Dart_NewStringFromCString(kIsolateLibURL));
   DART_CHECK_VALID(isolate_lib);
 
   result = Dart_Invoke(isolate_lib,
                        Dart_NewStringFromCString("_startMainIsolate"),
                        kStartIsolateArgumentsLength,
                        start_isolate_args);
   DART_CHECK_VALID(result);
 
   result = Dart_RunLoop();
+
+  // Here we log the error, but we don't do DART_CHECK_VALID because we don't
+  // want to bring the whole process down due to an error in application code,
+  // whereas above we do want to bring the whole process down for a bug in
+  // library or generated code.
   tonic::LogIfError(result);
-  DART_CHECK_VALID(result);
 }
 
 Dart_Handle DartController::LibraryTagHandler(Dart_LibraryTag tag,
                                               Dart_Handle library,
                                               Dart_Handle url) {
   if (tag == Dart_kCanonicalizeUrl) {
     std::string string = tonic::StdStringFromDart(url);
     if (StartsWithASCII(string, "dart:", true))
       return url;
   }
@@ skipping 164 matching lines @@
   {
     tonic::DartApiScope api_scope;
     ShutdownDartMojoIo();
   }
 
   auto isolate_data = MojoDartState::Cast(callback_data);
   delete isolate_data;
 }
 
 void DartController::UnhandledExceptionCallback(Dart_Handle error) {
+  Dart_Handle mojo_core_lib =
+      Builtin::GetLibrary(Builtin::kMojoInternalLibrary);
+  DART_CHECK_VALID(mojo_core_lib);
+  Dart_Handle handle_natives_type =
+      Dart_GetType(mojo_core_lib,
+                   Dart_NewStringFromCString("MojoHandleNatives"), 0, nullptr);
+  DART_CHECK_VALID(handle_natives_type);
+  Dart_Handle method_name = Dart_NewStringFromCString("_closeUnclosedHandles");
+  CHECK(!Dart_IsError(method_name));
+  Dart_Handle result =
+      Dart_Invoke(handle_natives_type, method_name, 0, nullptr);
+  DART_CHECK_VALID(result);
+
   auto isolate_data = MojoDartState::Current();
   if (!isolate_data->callbacks().exception.is_null()) {
+    int64_t handles_closed = 0;
+    Dart_Handle int_result = Dart_IntegerToInt64(result, &handles_closed);
+    DART_CHECK_VALID(int_result);
+
     // TODO(zra): Instead of passing an error handle, it may make life easier

[Cutch, 2015/10/26 17:10:03]

Is this TODO still relevant? 

[zra, 2015/10/26 17:53:54]

No. Removed.

     // for clients if we pass any error string here instead.
-    isolate_data->callbacks().exception.Run(error);
+    isolate_data->callbacks().exception.Run(error, handles_closed);
   }
-
-  // Close handles generated by the isolate.
-  std::set<MojoHandle>& handles = isolate_data->unclosed_handles();
-  for (auto it = handles.begin(); it != handles.end(); ++it) {
-    MojoClose((*it));
-  }
-  handles.clear();
 }
 
 
 bool DartController::initialized_ = false;
 bool DartController::service_isolate_running_ = false;
 bool DartController::service_isolate_spawned_ = false;
 bool DartController::strict_compilation_ = false;
 DartControllerServiceConnector* DartController::service_connector_ = nullptr;
 base::Lock DartController::lock_;
 
@@ skipping 258 matching lines @@
   }
   BlockForServiceIsolateLocked();
   StopHandleWatcherIsolate();
   Dart_Cleanup();
   service_isolate_running_ = false;
   initialized_ = false;
 }
 
 }  // namespace apps
 }  // namespace mojo