Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(48)

Side by Side Diff: runtime/vm/service.cc

Issue 411633002: Fix for issue 19817 (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « runtime/vm/native_api_impl.cc ('k') | runtime/vm/snapshot_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/service.h" 5 #include "vm/service.h"
6 6
7 #include "include/dart_api.h" 7 #include "include/dart_api.h"
8 #include "platform/globals.h" 8 #include "platform/globals.h"
9 9
10 #include "vm/compiler.h" 10 #include "vm/compiler.h"
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 // Setup library. 435 // Setup library.
436 library = Library::New(url_str); 436 library = Library::New(url_str);
437 library.Register(); 437 library.Register();
438 const Script& script = Script::Handle( 438 const Script& script = Script::Handle(
439 isolate, Script::New(url_str, source_str, RawScript::kLibraryTag)); 439 isolate, Script::New(url_str, source_str, RawScript::kLibraryTag));
440 library.SetLoadInProgress(); 440 library.SetLoadInProgress();
441 Dart_EnterScope(); // Need to enter scope for tag handler. 441 Dart_EnterScope(); // Need to enter scope for tag handler.
442 const Error& error = Error::Handle(isolate, 442 const Error& error = Error::Handle(isolate,
443 Compiler::Compile(library, script)); 443 Compiler::Compile(library, script));
444 ASSERT(error.IsNull()); 444 ASSERT(error.IsNull());
445 Dart_Handle result = Dart_FinalizeLoading(false);
446 ASSERT(!Dart_IsError(result));
445 Dart_ExitScope(); 447 Dart_ExitScope();
446 library.SetLoaded(); 448
447 // Install embedder default library tag handler again. 449 // Install embedder default library tag handler again.
448 isolate->set_library_tag_handler(embedder_provided_handler_); 450 isolate->set_library_tag_handler(embedder_provided_handler_);
449 embedder_provided_handler_ = NULL; 451 embedder_provided_handler_ = NULL;
450 library.set_native_entry_resolver(VmServiceNativeResolver); 452 library.set_native_entry_resolver(VmServiceNativeResolver);
451 } 453 }
452 { 454 {
453 // Boot the dart:vmservice library. 455 // Boot the dart:vmservice library.
454 Dart_EnterScope(); 456 Dart_EnterScope();
455 Dart_Handle result; 457 Dart_Handle result;
456 Dart_Handle url_str = 458 Dart_Handle url_str =
(...skipping 1925 matching lines...) Expand 10 before | Expand all | Expand 10 after
2382 while (current != NULL) { 2384 while (current != NULL) {
2383 if (strcmp(name, current->name()) == 0) { 2385 if (strcmp(name, current->name()) == 0) {
2384 return current; 2386 return current;
2385 } 2387 }
2386 current = current->next(); 2388 current = current->next();
2387 } 2389 }
2388 return NULL; 2390 return NULL;
2389 } 2391 }
2390 2392
2391 } // namespace dart 2393 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/native_api_impl.cc ('k') | runtime/vm/snapshot_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698