Index: runtime/observatory/lib/src/elements/debugger.dart |
diff --git a/runtime/observatory/lib/src/elements/debugger.dart b/runtime/observatory/lib/src/elements/debugger.dart |
index aa5264335613f6056c4c18e13b35a288de24121d..c9be5ec4d9616e95379a383de2722b916766f38e 100644 |
--- a/runtime/observatory/lib/src/elements/debugger.dart |
+++ b/runtime/observatory/lib/src/elements/debugger.dart |
@@ -7,6 +7,7 @@ library debugger_page_element; |
import 'dart:async'; |
import 'dart:html'; |
import 'observatory_element.dart'; |
+import 'package:observatory/app.dart'; |
import 'package:observatory/cli.dart'; |
import 'package:observatory/debugger.dart'; |
import 'package:observatory/service.dart'; |
@@ -878,11 +879,8 @@ class ObservatoryDebugger extends Debugger { |
} |
} |
Future.wait(pending).then((_) { |
- if (_isolateSubscription == null) { |
- _isolateSubscription = vm.isolateEvents.listen(_onEvent); |
- } |
- if (_debugSubscription == null) { |
- _debugSubscription = vm.debugEvents.listen(_onEvent); |
+ if (_subscription == null) { |
+ _subscription = vm.events.stream.listen(_onEvent); |
} |
_refreshStack(isolate.pauseEvent).then((_) { |
reportStatus(); |
@@ -908,8 +906,7 @@ class ObservatoryDebugger extends Debugger { |
} |
Isolate get isolate => _isolate; |
Isolate _isolate; |
- var _isolateSubscription; |
- var _debugSubscription; |
+ var _subscription; |
void init() { |
console.newline(); |
@@ -1176,6 +1173,7 @@ class ObservatoryDebugger extends Debugger { |
@CustomTag('debugger-page') |
class DebuggerPageElement extends ObservatoryElement { |
+ @published ObservatoryApplication app; |
@published Isolate isolate; |
isolateChanged(oldValue) { |