Expose arguments and options to handlers through JSONStream

runtime/vm/json_stream.cc

Index: runtime/vm/json_stream.cc
diff --git a/runtime/vm/json_stream.cc b/runtime/vm/json_stream.cc
index 045fced739376162c3f6017e002182b4a179a67f..b3a61d36c62a8841e9cc365a82aabe8f9c74b976 100644
--- a/runtime/vm/json_stream.cc
+++ b/runtime/vm/json_stream.cc
@@ -13,6 +13,11 @@ JSONStream::JSONStream(TextBuffer* buffer) {
   ASSERT(buffer != NULL);
   buffer_ = buffer;
   open_objects_ = 0;
+  arguments_ = NULL;
+  num_arguments_ = 0;
+  option_keys_ = NULL;
+  option_values_ = NULL;
+  num_options_ = 0;
 }
 
 
@@ -147,6 +152,21 @@ void JSONStream::PrintfProperty(const char* name, const char* format, ...) {
 }
 
 
+void JSONStream::SetArguments(const char** arguments, intptr_t num_arguments) {
+  arguments_ = arguments;
+  num_arguments_ = num_arguments;
+}
+
+
+void JSONStream::SetOptions(const char** option_keys,
+                            const char** option_values,
+                            intptr_t num_options) {
+  option_keys_ = option_keys;
+  option_values_ = option_values;
+  num_options_ = num_options;
+}
+
+
 void JSONStream::PrintProperty(const char* name, const Object& o, bool ref) {
   PrintPropertyName(name);
   PrintValue(o, ref);