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

Unified Diff: runtime/bin/main.cc

Issue 1411853003: Service isolate requests Observatory assets from embedder (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: 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 | « runtime/bin/gen_snapshot.cc ('k') | runtime/bin/observatory_assets_empty.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/main.cc
diff --git a/runtime/bin/main.cc b/runtime/bin/main.cc
index fbe6bec90d1c9f1c56d2a461cd130934cb293ac7..dacbb8feccd7dc5dc1a0947aa6fcf415495e9283 100644
--- a/runtime/bin/main.cc
+++ b/runtime/bin/main.cc
@@ -1346,6 +1346,15 @@ bool RunMainIsolate(const char* script_name,
#undef CHECK_RESULT
+extern unsigned int observatory_assets_archive_len;
+extern const char* observatory_assets_archive;
+
+Dart_Handle GetVMServiceAssetsArchiveCallback() {
+ return DartUtils::MakeUint8Array(
+ reinterpret_cast<const uint8_t*>(&observatory_assets_archive[0]),
+ observatory_assets_archive_len);
+}
+
void main(int argc, char** argv) {
char* script_name;
@@ -1436,7 +1445,8 @@ void main(int argc, char** argv) {
DartUtils::ReadFile,
DartUtils::WriteFile,
DartUtils::CloseFile,
- DartUtils::EntropySource);
+ DartUtils::EntropySource,
+ GetVMServiceAssetsArchiveCallback);
if (error != NULL) {
if (do_vm_shutdown) {
DebuggerConnectionHandler::StopHandler();
« no previous file with comments | « runtime/bin/gen_snapshot.cc ('k') | runtime/bin/observatory_assets_empty.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698