Timeline API fixes for Flutter

runtime/lib/timeline.cc

 // 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.
 
 #include "vm/bootstrap_natives.h"
 
 #include "include/dart_api.h"
 
 #include "vm/native_entry.h"
 #include "vm/object.h"
@@ skipping 35 matching lines @@
   GET_NON_NULL_NATIVE_ARGUMENT(String, phase, arguments->NativeArgAt(2));
   GET_NON_NULL_NATIVE_ARGUMENT(String, category, arguments->NativeArgAt(3));
   GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(4));
   GET_NON_NULL_NATIVE_ARGUMENT(String, args, arguments->NativeArgAt(5));
 
   TimelineEventRecorder* recorder = Timeline::recorder();
   if (recorder == NULL) {
     return Object::null();
   }
 
-  TimelineEvent* event = isolate->GetDartStream()->StartEvent();
+  TimelineEvent* event = Timeline::GetDartStream()->StartEvent();
   if (event == NULL) {
     // Stream was turned off.
     return Object::null();
   }
 
   int64_t pid = OS::ProcessId();
   OSThread* os_thread = thread->os_thread();
   ASSERT(os_thread != NULL);
   int64_t tid = OSThread::ThreadIdToIntPtr(os_thread->trace_id());
   // Convert phase to a C string and perform a sanity check.
@@ skipping 44 matching lines @@
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, end, arguments->NativeArgAt(1));
   GET_NON_NULL_NATIVE_ARGUMENT(String, category, arguments->NativeArgAt(2));
   GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(3));
   GET_NON_NULL_NATIVE_ARGUMENT(String, args, arguments->NativeArgAt(4));
 
   TimelineEventRecorder* recorder = Timeline::recorder();
   if (recorder == NULL) {
     return Object::null();
   }
 
-  TimelineEvent* event = isolate->GetDartStream()->StartEvent();
+  TimelineEvent* event = Timeline::GetDartStream()->StartEvent();
   if (event == NULL) {
     // Stream was turned off.
     return Object::null();
   }
 
   int64_t duration = end.AsInt64Value() - start.AsInt64Value();
   int64_t pid = OS::ProcessId();
   OSThread* os_thread = thread->os_thread();
   ASSERT(os_thread != NULL);
   int64_t tid = OSThread::ThreadIdToIntPtr(os_thread->trace_id());
@@ skipping 24 matching lines @@
   GET_NON_NULL_NATIVE_ARGUMENT(Integer, start, arguments->NativeArgAt(0));
   GET_NON_NULL_NATIVE_ARGUMENT(String, category, arguments->NativeArgAt(1));
   GET_NON_NULL_NATIVE_ARGUMENT(String, name, arguments->NativeArgAt(2));
   GET_NON_NULL_NATIVE_ARGUMENT(String, args, arguments->NativeArgAt(3));
 
   TimelineEventRecorder* recorder = Timeline::recorder();
   if (recorder == NULL) {
     return Object::null();
   }
 
-  TimelineEvent* event = isolate->GetDartStream()->StartEvent();
+  TimelineEvent* event = Timeline::GetDartStream()->StartEvent();
   if (event == NULL) {
     // Stream was turned off.
     return Object::null();
   }
 
   int64_t pid = OS::ProcessId();
   OSThread* os_thread = thread->os_thread();
   ASSERT(os_thread != NULL);
   int64_t tid = OSThread::ThreadIdToIntPtr(os_thread->trace_id());
 
   char* json = OS::SCreate(zone,
       "{\"name\":\"%s\",\"cat\":\"%s\",\"tid\":%" Pd64 ",\"pid\":%" Pd64 ","
       "\"ts\":%" Pd64 ",\"ph\":\"I\",\"args\":%s}",
       name.ToCString(),
       category.ToCString(),
       tid,
       pid,
       start.AsInt64Value(),
       args.ToCString());
 
   event->Instant("", start.AsInt64Value());
   // json was allocated in the zone and a copy will be stored in event.
   event->CompleteWithPreSerializedJSON(json);
 
   return Object::null();
 }
 
 }  // namespace dart