Remove DebuggerEvent. Refactor remaining code.

runtime/vm/service_event.h

 // Copyright (c) 2015, 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_SERVICE_EVENT_H_
 #define VM_SERVICE_EVENT_H_
 
-#include "vm/debugger.h"
-
-class DebuggerEvent;
-class TimelineEventBlock;
+#include "vm/globals.h"
+#include "vm/heap.h"
 
 namespace dart {
 
+class ActivationFrame;
+class Breakpoint;
+class Instance;
+class Isolate;
+class Object;
+class StreamInfo;
+class String;
+class TimelineEventBlock;
+
 class ServiceEvent {
  public:
   enum EventKind {
     kVMUpdate,           // VM identity information has changed
 
     kIsolateStart,       // New isolate has started
     kIsolateRunnable,    // Isolate is ready to run
     kIsolateExit,        // Isolate has exited
     kIsolateUpdate,      // Isolate identity information has changed
 
@@ skipping 36 matching lines @@
     const Instance* stack_trace;
   };
 
   struct ExtensionEvent {
     const String* event_kind;
     const String* event_data;
   };
 
   ServiceEvent(Isolate* isolate, EventKind event_kind);
 
-  explicit ServiceEvent(const DebuggerEvent* debugger_event);
+  Isolate* isolate() const { return isolate_; }
 
-  Isolate* isolate() const { return isolate_; }
+  // Used by the C embedding api.
+  Dart_Port isolate_id() const {
+    return isolate_->main_port();
+  }
 
   EventKind kind() const { return kind_; }
 
   bool IsPause() const {
     switch (kind())  {
       case kPauseStart:
       case kPauseExit:
       case kPauseBreakpoint:
       case kPauseInterrupted:
       case kPauseException:
         return true;
       default:
         return false;
     }
   }
 
   const char* embedder_kind() const { return embedder_kind_; }
 
   const char* KindAsCString() const;
 
   void set_embedder_kind(const char* embedder_kind) {
     embedder_kind_ = embedder_kind;
   }
 
+  const StreamInfo* stream_info() const;
   const char* stream_id() const;
 
   void set_embedder_stream_id(const char* stream_id) {
     embedder_stream_id_ = stream_id;
   }
 
   Breakpoint* breakpoint() const {
     return breakpoint_;
   }
   void set_breakpoint(Breakpoint* bpt) {
@@ skipping 67 matching lines @@
   }
 
   void set_log_record(const LogRecord& log_record) {
     log_record_ = log_record;
   }
 
   void set_extension_event(const ExtensionEvent& extension_event) {
     extension_event_ = extension_event;
   }
 
+  void UpdateTimestamp();
+
   int64_t timestamp() const {
     return timestamp_;
   }
 
   const TimelineEventBlock* timeline_event_block() const {
     return timeline_event_block_;
   }
 
   void set_timeline_event_block(const TimelineEventBlock* block) {
     ASSERT(kind() == kTimelineEvents);
@@ skipping 20 matching lines @@
   const uint8_t* bytes_;
   intptr_t bytes_length_;
   LogRecord log_record_;
   ExtensionEvent extension_event_;
   int64_t timestamp_;
 };
 
 }  // namespace dart
 
 #endif  // VM_SERVICE_EVENT_H_