| Index: runtime/vm/json_stream.cc
|
| diff --git a/runtime/vm/json_stream.cc b/runtime/vm/json_stream.cc
|
| index 729330f9998ff673d518beb77347eae402af9ed7..e716e508e45381b6ed937406b35b3926ad852ad0 100644
|
| --- a/runtime/vm/json_stream.cc
|
| +++ b/runtime/vm/json_stream.cc
|
| @@ -12,6 +12,7 @@
|
| #include "vm/object.h"
|
| #include "vm/service_event.h"
|
| #include "vm/service.h"
|
| +#include "vm/timeline.h"
|
| #include "vm/unicode.h"
|
|
|
|
|
| @@ -391,6 +392,12 @@ void JSONStream::PrintValue(Isolate* isolate, bool ref) {
|
| }
|
|
|
|
|
| +void JSONStream::PrintValue(TimelineEvent* timeline_event) {
|
| + PrintCommaIfNeeded();
|
| + timeline_event->PrintJSON(this);
|
| +}
|
| +
|
| +
|
| void JSONStream::PrintServiceId(const Object& o) {
|
| ASSERT(id_zone_ != NULL);
|
| PrintProperty("id", id_zone_->GetServiceId(o));
|
| @@ -481,6 +488,13 @@ void JSONStream::PrintProperty(const char* name, Isolate* isolate) {
|
| }
|
|
|
|
|
| +void JSONStream::PrintProperty(const char* name,
|
| + TimelineEvent* timeline_event) {
|
| + PrintPropertyName(name);
|
| + PrintValue(timeline_event);
|
| +}
|
| +
|
| +
|
| void JSONStream::PrintfProperty(const char* name, const char* format, ...) {
|
| PrintPropertyName(name);
|
| va_list args;
|
|
|