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

Unified Diff: runtime/bin/vmservice/vmservice_io.dart

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/vmservice/server.dart ('k') | runtime/include/dart_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/vmservice/vmservice_io.dart
diff --git a/runtime/bin/vmservice/vmservice_io.dart b/runtime/bin/vmservice/vmservice_io.dart
index eb44a6c52a56f1635edb950ef55f2a3ae353a185..1f7eee2867a296c62feb26b35a96faf9189446e6 100644
--- a/runtime/bin/vmservice/vmservice_io.dart
+++ b/runtime/bin/vmservice/vmservice_io.dart
@@ -11,7 +11,6 @@ import 'dart:isolate';
import 'dart:_vmservice';
part 'loader.dart';
-part 'resources.dart';
part 'server.dart';
// The TCP ip/port that the HTTP server listens on.
@@ -25,9 +24,10 @@ bool _isWindows = false;
var _signalWatch;
var _signalSubscription;
-// HTTP servr.
+// HTTP server.
Server server;
Future<Server> serverFuture;
+Map<String, Asset> assets;
_onShutdown() {
if (server != null) {
@@ -42,8 +42,11 @@ _onShutdown() {
}
_bootServer() {
- // Load resources.
- _triggerResourceLoad();
+ try {
+ assets = Asset.request();
+ } catch (e) {
+ print('Could not load Observatory assets: $e');
+ }
// Lazily create service.
var service = new VMService();
service.onShutdown = _onShutdown;
« no previous file with comments | « runtime/bin/vmservice/server.dart ('k') | runtime/include/dart_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698