Remove inclusion of 'include/dart_api.h' in 'raw_object.h'

runtime/vm/dart_api_impl.cc

 // Copyright (c) 2012, 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 "include/dart_api.h"
 
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 236 matching lines @@
 }
 
 
 void Api::InitOnce() {
   ASSERT(api_native_key_ == Thread::kUnsetThreadLocalKey);
   api_native_key_ = Thread::CreateThreadLocal();
   ASSERT(api_native_key_ != Thread::kUnsetThreadLocalKey);
 }
 
 
+bool Api::ExternalStringGetPeerHelper(Dart_Handle object, void** peer) {
+  NoGCScope no_gc_scope;
+  RawObject* raw_obj = Api::UnwrapHandle(object);
+  switch (Api::ClassId(object)) {
+    case kExternalOneByteStringCid: {
+      RawExternalOneByteString* raw_string =
+          reinterpret_cast<RawExternalOneByteString*>(raw_obj)->ptr();
+      ExternalStringData<uint8_t>* data = raw_string->external_data_;
+      *peer = data->peer();
+      return true;
+    }
+    case kExternalTwoByteStringCid: {
+      RawExternalTwoByteString* raw_string =
+          reinterpret_cast<RawExternalTwoByteString*>(raw_obj)->ptr();
+      ExternalStringData<uint16_t>* data = raw_string->external_data_;
+      *peer = data->peer();
+      return true;
+    }
+    case kExternalFourByteStringCid: {
+      RawExternalFourByteString* raw_string =
+          reinterpret_cast<RawExternalFourByteString*>(raw_obj)->ptr();
+      ExternalStringData<uint32_t>* data = raw_string->external_data_;
+      *peer = data->peer();
+      return true;
+    }
+  }
+  return false;
+}
+
+
 // --- Handles ---
 
 
 DART_EXPORT bool Dart_IsError(Dart_Handle handle) {
   return RawObject::IsErrorClassId(Api::ClassId(handle));
 }
 
 
 DART_EXPORT bool Dart_IsApiError(Dart_Handle object) {
   return Api::ClassId(object) == kApiErrorCid;
@@ skipping 1252 matching lines @@
   CHECK_LENGTH(length, String::kMaxElements);
   return Api::NewHandle(isolate, String::New(codepoints, length));
 }
 
 
 DART_EXPORT bool Dart_IsExternalString(Dart_Handle object) {
   return RawObject::IsExternalStringClassId(Api::ClassId(object));
 }
 
 
-bool ExternalStringGetPeerHelper(Dart_Handle object, void** peer) {
-  NoGCScope no_gc_scope;
-  RawObject* raw_obj = Api::UnwrapHandle(object);
-  switch (Api::ClassId(object)) {
-    case kExternalOneByteStringCid: {
-      RawExternalOneByteString* raw_string =
-          reinterpret_cast<RawExternalOneByteString*>(raw_obj)->ptr();
-      ExternalStringData<uint8_t>* data = raw_string->external_data_;
-      *peer = data->peer();
-      return true;
-    }
-    case kExternalTwoByteStringCid: {
-      RawExternalTwoByteString* raw_string =
-          reinterpret_cast<RawExternalTwoByteString*>(raw_obj)->ptr();
-      ExternalStringData<uint16_t>* data = raw_string->external_data_;
-      *peer = data->peer();
-      return true;
-    }
-    case kExternalFourByteStringCid: {
-      RawExternalFourByteString* raw_string =
-          reinterpret_cast<RawExternalFourByteString*>(raw_obj)->ptr();
-      ExternalStringData<uint32_t>* data = raw_string->external_data_;
-      *peer = data->peer();
-      return true;
-    }
-  }
-  return false;
-}
-
-
 DART_EXPORT Dart_Handle Dart_ExternalStringGetPeer(Dart_Handle object,
                                                    void** peer) {
   if (peer == NULL) {
     RETURN_NULL_ERROR(peer);
   }
 
-  if (ExternalStringGetPeerHelper(object, peer)) {
+  if (Api::ExternalStringGetPeerHelper(object, peer)) {
     return Api::Success(Isolate::Current());
   }
 
   // It's not an external string, return appropriate error.
   // Note: this is invoked outside of the NoGCScope'd block above, since
   // error messages allocate new handles.
   if (!RawObject::IsStringClassId(Api::ClassId(object))) {
     RETURN_TYPE_ERROR(Isolate::Current(), object, String);
   } else {
     return
@@ skipping 2610 matching lines @@
 DART_EXPORT void Dart_InitPerfEventsSupport(Dart_FileWriterFunction function) {
   Dart::set_perf_events_writer(function);
 }
 
 
 DART_EXPORT void Dart_InitFlowGraphPrinting(Dart_FileWriterFunction function) {
   Dart::set_flow_graph_writer(function);
 }
 
 }  // namespace dart