Major rework of vm service events.

runtime/vm/debugger.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_DEBUGGER_H_
 #define VM_DEBUGGER_H_
 
 #include "include/dart_debugger_api.h"
 
 #include "vm/object.h"
@@ skipping 259 matching lines @@
   friend class Debugger;
   DISALLOW_COPY_AND_ASSIGN(DebuggerStackTrace);
 };
 
 
 typedef void BreakpointHandler(Dart_Port isolate_id,
                                SourceBreakpoint* bpt,
                                DebuggerStackTrace* stack);
 
 
-// TODO(turnidge): At some point we may want to turn this into a class
-// hierarchy.
 class DebuggerEvent {
  public:
   enum EventType {
     kBreakpointReached = 1,
     kBreakpointResolved = 2,
     kExceptionThrown = 3,
     kIsolateCreated = 4,
     kIsolateShutdown = 5,
     kIsolateInterrupted = 6,
-    kIsolateResumed = 7,
   };
 
   explicit DebuggerEvent(Isolate* isolate, EventType event_type)
       : isolate_(isolate),
         type_(event_type),
         top_frame_(NULL),
         breakpoint_(NULL),
         exception_(NULL) {}
 
   Isolate* isolate() const { return isolate_; }
 
   EventType type() const { return type_; }
 
+  bool IsPauseEvent() const {
+    return (type_ == kBreakpointReached ||
+            type_ == kIsolateInterrupted ||
+            type_ == kExceptionThrown);
+  }
+
   ActivationFrame* top_frame() const {
-    ASSERT(type_ == kBreakpointReached);
+    ASSERT(IsPauseEvent());
     return top_frame_;
   }
   void set_top_frame(ActivationFrame* frame) {
-    ASSERT(type_ == kBreakpointReached);
+    ASSERT(IsPauseEvent());
     top_frame_ = frame;
   }
 
   SourceBreakpoint* breakpoint() const {
     ASSERT(type_ == kBreakpointReached || type_ == kBreakpointResolved);
     return breakpoint_;
   }
   void set_breakpoint(SourceBreakpoint* bpt) {
     ASSERT(type_ == kBreakpointReached || type_ == kBreakpointResolved);
     breakpoint_ = bpt;
   }
 
   const Object* exception() const {
     ASSERT(type_ == kExceptionThrown);
     return exception_;
   }
   void set_exception(const Object* exception) {
     ASSERT(type_ == kExceptionThrown);
     exception_ = exception;
   }
 
   Dart_Port isolate_id() const {
     return isolate_->main_port();
   }
 
-  void PrintJSON(JSONStream* js) const;
-
-  static const char* EventTypeToCString(EventType type);
-
  private:
   Isolate* isolate_;
   EventType type_;
   ActivationFrame* top_frame_;
   SourceBreakpoint* breakpoint_;
   const Object* exception_;
 };
 
 
 class Debugger {
@@ skipping 214 matching lines @@
 
   friend class Isolate;
   friend class SourceBreakpoint;
   DISALLOW_COPY_AND_ASSIGN(Debugger);
 };
 
 
 }  // namespace dart
 
 #endif  // VM_DEBUGGER_H_