Revert "Hide Isolate pointer from embedder"

runtime/vm/json_stream.cc

 // 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.
 
 #include "platform/assert.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/json_stream.h"
 #include "vm/message.h"
 #include "vm/metrics.h"
 #include "vm/object.h"
 #include "vm/service_event.h"
 #include "vm/service.h"
 #include "vm/unicode.h"
 
 
 namespace dart {
 
 DECLARE_FLAG(bool, trace_service);
 
 JSONStream::JSONStream(intptr_t buf_size)
     : open_objects_(0),
       buffer_(buf_size),
       default_id_zone_(Isolate::Current()->object_id_ring(),
                        ObjectIdRing::kAllocateId),
       id_zone_(&default_id_zone_),
-      reply_port_(DART_ILLEGAL_PORT),
+      reply_port_(ILLEGAL_PORT),
       seq_(""),
       method_(""),
       param_keys_(NULL),
       param_values_(NULL),
       num_params_(0) {
 }
 
 
 JSONStream::~JSONStream() {
 }
@@ skipping 113 matching lines @@
 
 
 static uint8_t* allocator(uint8_t* ptr, intptr_t old_size, intptr_t new_size) {
   void* new_ptr = realloc(reinterpret_cast<void*>(ptr), new_size);
   return reinterpret_cast<uint8_t*>(new_ptr);
 }
 
 
 void JSONStream::PostReply() {
   Dart_Port port = reply_port();
-  ASSERT(port != DART_ILLEGAL_PORT);
-  set_reply_port(DART_ILLEGAL_PORT);  // Prevent double replies.
+  ASSERT(port != ILLEGAL_PORT);
+  set_reply_port(ILLEGAL_PORT);  // Prevent double replies.
   int64_t process_delta_micros = 0;
   if (FLAG_trace_service) {
     process_delta_micros = OS::GetCurrentTimeMicros() - setup_time_micros_;
   }
   // TODO(turnidge): Handle non-string sequence numbers.
   buffer_.Printf(", \"id\":\"%s\"}", seq());
   const String& reply = String::Handle(String::New(ToCString()));
   ASSERT(!reply.IsNull());
 
   uint8_t* data = NULL;
@@ skipping 414 matching lines @@
   intptr_t len2 = OS::VSNPrint(p, len+1, format, args);
   va_end(args);
   ASSERT(len == len2);
   stream_->buffer_.AddChar('"');
   stream_->AddEscapedUTF8String(p);
   stream_->buffer_.AddChar('"');
   free(p);
 }
 
 }  // namespace dart