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

Unified Diff: sky/engine/core/script/dart_loader.cc

Issue 1130353009: Teach SkyView how to load the main script (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 7 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
Index: sky/engine/core/script/dart_loader.cc
diff --git a/sky/engine/core/script/dart_loader.cc b/sky/engine/core/script/dart_loader.cc
index 9f6418167ec2aa7f2f7a705a8566f8302c9a1fb9..4f60c5aa46fa6ffc173af17813d7e40802a795b7 100644
--- a/sky/engine/core/script/dart_loader.cc
+++ b/sky/engine/core/script/dart_loader.cc
@@ -231,16 +231,19 @@ void DartLoader::WaitForDependencies(
adoptPtr(new DependencyWatcher(dependencies, callback)));
}
-Dart_Handle DartLoader::Import(Dart_Handle library, Dart_Handle url) {
- KURL parsed_url(ParsedURLString, StringFromDart(url));
- const auto& result = pending_libraries_.add(parsed_url.string(), nullptr);
+void DartLoader::LoadLibrary(const KURL& url) {
+ const auto& result = pending_libraries_.add(url.string(), nullptr);
if (result.isNewEntry) {
- OwnPtr<Job> job = adoptPtr(new ImportJob(this, parsed_url));
+ OwnPtr<Job> job = adoptPtr(new ImportJob(this, url));
result.storedValue->value = job.get();
jobs_.add(job.release());
}
if (dependency_catcher_)
dependency_catcher_->AddDependency(result.storedValue->value);
+}
+
+Dart_Handle DartLoader::Import(Dart_Handle library, Dart_Handle url) {
+ LoadLibrary(KURL(ParsedURLString, StringFromDart(url)));
return Dart_True();
}

Powered by Google App Engine
This is Rietveld 408576698