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

Unified Diff: runtime/lib/isolate.cc

Issue 1424703004: Getting rid of Isolate::current_zone() usage. Pass thread instead of isolate where it makes sense. (Closed) Base URL: https://github.com/dart-lang/sdk.git@master
Patch Set: Fix build Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | runtime/lib/vmservice.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/lib/isolate.cc
diff --git a/runtime/lib/isolate.cc b/runtime/lib/isolate.cc
index 349788c1b765efc1618c6292c8ec8b8649c20600..d62bb2bfc0d1193c33e89f43722ef3d1d5adb35f 100644
--- a/runtime/lib/isolate.cc
+++ b/runtime/lib/isolate.cc
@@ -233,12 +233,13 @@ static char* String2UTF8(const String& str) {
}
-static char* CanonicalizeUri(Isolate* isolate,
+static char* CanonicalizeUri(Thread* thread,
const Library& library,
const String& uri,
char** error) {
char* result = NULL;
- Zone* zone = isolate->current_zone();
+ Zone* zone = thread->zone();
+ Isolate* isolate = thread->isolate();
Dart_LibraryTagHandler handler = isolate->library_tag_handler();
if (handler != NULL) {
Dart_EnterScope();
@@ -292,7 +293,7 @@ DEFINE_NATIVE_ENTRY(Isolate_spawnUri, 12) {
const Library& root_lib =
Library::Handle(isolate->object_store()->root_library());
char* error = NULL;
- char* canonical_uri = CanonicalizeUri(isolate, root_lib, uri, &error);
+ char* canonical_uri = CanonicalizeUri(thread, root_lib, uri, &error);
if (canonical_uri == NULL) {
const String& msg = String::Handle(String::New(error));
ThrowIsolateSpawnException(msg);
« no previous file with comments | « no previous file | runtime/lib/vmservice.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698