Revert "Per-closure breakpoints; restructure breakpoint implementation to keep a list of conditions…

runtime/vm/json_stream.h

 // Copyright (c) 2013, 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_JSON_STREAM_H_
 #define VM_JSON_STREAM_H_
 
 #include "include/dart_api.h"  // for Dart_Port
 #include "platform/json.h"
 #include "vm/allocation.h"
 #include "vm/service.h"
 
 namespace dart {
 
 class Array;
 class Field;
 class GrowableObjectArray;
 class Instance;
 class JSONArray;
 class JSONObject;
 class MessageQueue;
 class Metric;
 class Object;
 class ServiceEvent;
-class Breakpoint;
+class SourceBreakpoint;
 class String;
 class Zone;
 
 
 enum JSONRpcErrorCode {
   kParseError     = -32700,
   kInvalidRequest = -32600,
   kMethodNotFound = -32601,
   kInvalidParams  = -32602,
   kInternalError  = -32603,
@@ skipping 72 matching lines @@
 
   void PrintValueBool(bool b);
   void PrintValue(intptr_t i);
   void PrintValue64(int64_t i);
   void PrintValue(double d);
   void PrintValue(const char* s);
   void PrintValue(const char* s, intptr_t len);
   void PrintValueNoEscape(const char* s);
   void PrintfValue(const char* format, ...) PRINTF_ATTRIBUTE(2, 3);
   void PrintValue(const Object& o, bool ref = true);
-  void PrintValue(Breakpoint* bpt);
+  void PrintValue(SourceBreakpoint* bpt);
   void PrintValue(const ServiceEvent* event);
   void PrintValue(Metric* metric);
   void PrintValue(MessageQueue* queue);
   void PrintValue(Isolate* isolate, bool ref = true);
   bool PrintValueStr(const String& s, intptr_t limit);
 
   void PrintServiceId(const char* name, const Object& o);
   void PrintPropertyBool(const char* name, bool b);
   void PrintProperty(const char* name, intptr_t i);
   void PrintProperty64(const char* name, int64_t i);
   void PrintProperty(const char* name, double d);
   void PrintProperty(const char* name, const char* s);
   bool PrintPropertyStr(const char* name, const String& s, intptr_t limit);
   void PrintPropertyNoEscape(const char* name, const char* s);
   void PrintfProperty(const char* name, const char* format, ...)
   PRINTF_ATTRIBUTE(3, 4);
   void PrintProperty(const char* name, const Object& o, bool ref = true);
 
   void PrintProperty(const char* name, const ServiceEvent* event);
-  void PrintProperty(const char* name, Breakpoint* bpt);
+  void PrintProperty(const char* name, SourceBreakpoint* bpt);
   void PrintProperty(const char* name, Metric* metric);
   void PrintProperty(const char* name, MessageQueue* queue);
   void PrintProperty(const char* name, Isolate* isolate);
   void PrintPropertyName(const char* name);
   void PrintCommaIfNeeded();
   bool NeedComma();
 
   bool AddDartString(const String& s, intptr_t limit);
   void AddEscapedUTF8String(const char* s);
   void AddEscapedUTF8String(const char* s, intptr_t len);
@@ skipping 58 matching lines @@
   }
   void AddPropertyNoEscape(const char* name, const char* s) const {
     stream_->PrintPropertyNoEscape(name, s);
   }
   void AddProperty(const char* name, const Object& obj, bool ref = true) const {
     stream_->PrintProperty(name, obj, ref);
   }
   void AddProperty(const char* name, const ServiceEvent* event) const {
     stream_->PrintProperty(name, event);
   }
-  void AddProperty(const char* name, Breakpoint* bpt) const {
+  void AddProperty(const char* name, SourceBreakpoint* bpt) const {
     stream_->PrintProperty(name, bpt);
   }
   void AddProperty(const char* name, Metric* metric) const {
     stream_->PrintProperty(name, metric);
   }
   void AddProperty(const char* name, MessageQueue* queue) const {
     stream_->PrintProperty(name, queue);
   }
   void AddProperty(const char* name, Isolate* isolate) const {
     stream_->PrintProperty(name, isolate);
@@ skipping 30 matching lines @@
   void AddValue(intptr_t i) const { stream_->PrintValue(i); }
   void AddValue64(int64_t i) const { stream_->PrintValue64(i); }
   void AddValue(double d) const { stream_->PrintValue(d); }
   void AddValue(const char* s) const { stream_->PrintValue(s); }
   void AddValue(const Object& obj, bool ref = true) const {
     stream_->PrintValue(obj, ref);
   }
   void AddValue(Isolate* isolate, bool ref = true) const {
     stream_->PrintValue(isolate, ref);
   }
-  void AddValue(Breakpoint* bpt) const {
+  void AddValue(SourceBreakpoint* bpt) const {
     stream_->PrintValue(bpt);
   }
   void AddValue(const ServiceEvent* event) const {
     stream_->PrintValue(event);
   }
   void AddValue(Metric* metric) const {
     stream_->PrintValue(metric);
   }
   void AddValue(MessageQueue* queue) const {
     stream_->PrintValue(queue);
   }
   void AddValueF(const char* format, ...) const PRINTF_ATTRIBUTE(2, 3);
 
  private:
   JSONStream* stream_;
 
   friend class JSONObject;
 
   DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(JSONArray);
 };
 
 }  // namespace dart
 
 #endif  // VM_JSON_STREAM_H_