- Account for the possibility of timer objects being nested.

vm/dart_api_impl.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 2189 matching lines @@
       lib.SetLoadError();
     }
   }
   isolate->set_long_jump_base(base);
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadScript(Dart_Handle url,
                                         Dart_Handle source,
                                         Dart_LibraryTagHandler handler) {
+  TIMERSCOPE(time_script_loading);
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
-  TIMERSCOPE(time_script_loading);
   const String& url_str = Api::UnwrapStringHandle(url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(url, String);
   }
   const String& source_str = Api::UnwrapStringHandle(source);
   if (source_str.IsNull()) {
     RETURN_TYPE_ERROR(source, String);
   }
   Library& library = Library::Handle(isolate->object_store()->root_library());
   if (!library.IsNull()) {
@@ skipping 127 matching lines @@
   if (library.IsNull()) {
     return Api::NewError("%s: library '%s' not found.",
                          CURRENT_FUNC, url_str.ToCString());
   } else {
     return Api::NewLocalHandle(library);
   }
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadLibrary(Dart_Handle url, Dart_Handle source) {
+  TIMERSCOPE(time_script_loading);
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const String& url_str = Api::UnwrapStringHandle(url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(url, String);
   }
   const String& source_str = Api::UnwrapStringHandle(source);
   if (source_str.IsNull()) {
     RETURN_TYPE_ERROR(source, String);
   }
@@ skipping 30 matching lines @@
     RETURN_TYPE_ERROR(import, Library);
   }
   library_vm.AddImport(import_vm);
   return Api::Success();
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadSource(Dart_Handle library,
                                         Dart_Handle url,
                                         Dart_Handle source) {
+  TIMERSCOPE(time_script_loading);
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   const Library& lib = Api::UnwrapLibraryHandle(library);
   if (lib.IsNull()) {
     RETURN_TYPE_ERROR(library, Library);
   }
   const String& url_str = Api::UnwrapStringHandle(url);
   if (url_str.IsNull()) {
     RETURN_TYPE_ERROR(url, String);
   }
@@ skipping 45 matching lines @@
     }
     delete debug_region;
   } else {
     *buffer = NULL;
     *buffer_size = 0;
   }
 }
 
 
 }  // namespace dart