Index: runtime/vm/debugger.cc |
diff --git a/runtime/vm/debugger.cc b/runtime/vm/debugger.cc |
index 6f761b6d4db0dffc6a6d5ce16823bc161098896a..dc6d0b39da27d8b6a874c96c0536dc5c22beb6a9 100644 |
--- a/runtime/vm/debugger.cc |
+++ b/runtime/vm/debugger.cc |
@@ -236,8 +236,8 @@ ActivationFrame::ActivationFrame( |
bool Debugger::HasEventHandler() { |
return ((event_handler_ != NULL) || |
- Service::NeedsIsolateEvents() || |
- Service::NeedsDebugEvents()); |
+ Service::isolate_stream.enabled() || |
+ Service::debug_stream.enabled()); |
} |
@@ -251,11 +251,11 @@ static bool ServiceNeedsDebuggerEvent(DebuggerEvent::EventType type) { |
case DebuggerEvent::kBreakpointReached: |
case DebuggerEvent::kExceptionThrown: |
case DebuggerEvent::kIsolateInterrupted: |
- return Service::NeedsDebugEvents(); |
+ return Service::debug_stream.enabled(); |
case DebuggerEvent::kIsolateCreated: |
case DebuggerEvent::kIsolateShutdown: |
- return Service::NeedsIsolateEvents(); |
+ return Service::isolate_stream.enabled(); |
default: |
UNREACHABLE(); |
@@ -324,10 +324,10 @@ void Debugger::SignalIsolateInterrupted() { |
// The vm service handles breakpoint notifications in a different way |
// than the regular debugger breakpoint notifications. |
-static void SendServiceBreakpointEvent(ServiceEvent::EventType type, |
+static void SendServiceBreakpointEvent(ServiceEvent::EventKind kind, |
Breakpoint* bpt) { |
- if (Service::NeedsDebugEvents()) { |
- ServiceEvent service_event(Isolate::Current(), type); |
+ if (Service::debug_stream.enabled()) { |
+ ServiceEvent service_event(Isolate::Current(), kind); |
service_event.set_breakpoint(bpt); |
Service::HandleEvent(&service_event); |
} |