- Add different types for persistent and weak persistent handles

runtime/vm/dart_api_impl.h

 // Copyright (c) 2011, 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.
 
 #ifndef VM_DART_API_IMPL_H_
 #define VM_DART_API_IMPL_H_
 
 #include "vm/allocation.h"
 #include "vm/object.h"
 
@@ skipping 56 matching lines @@
   static RawObject* UnwrapHandle(Dart_Handle object);
 
   // Unwraps a raw Type from the handle.  The handle will be null if
   // the object was not of the requested Type.
 #define DECLARE_UNWRAP(Type)                                                   \
   static const Type& Unwrap##Type##Handle(Isolate* isolate,                    \
                                           Dart_Handle object);
   CLASS_LIST_FOR_HANDLES(DECLARE_UNWRAP)
 #undef DECLARE_UNWRAP
 
-  // Validates and converts the passed in handle as a local handle.
-  static LocalHandle* UnwrapAsLocalHandle(const ApiState& state,
-                                          Dart_Handle object);
-
   // Validates and converts the passed in handle as a persistent handle.
-  static PersistentHandle* UnwrapAsPersistentHandle(const ApiState& state,
-                                                    Dart_Handle object);
+  static PersistentHandle* UnwrapAsPersistentHandle(Dart_PersistentHandle object);
 
   // Validates and converts the passed in handle as a weak persistent handle.
   static FinalizablePersistentHandle* UnwrapAsWeakPersistentHandle(
-      const ApiState& state,
-      Dart_Handle object);
+      Dart_WeakPersistentHandle object);
 
   // Validates and converts the passed in handle as a prologue weak
   // persistent handle.
   static FinalizablePersistentHandle* UnwrapAsPrologueWeakPersistentHandle(
-      const ApiState& state,
-      Dart_Handle object);
+      Dart_WeakPersistentHandle object);
 
   // Returns an Error handle if isolate is in an inconsistent state.
   // Returns a Success handle when no error condition exists.
   static Dart_Handle CheckIsolateState(Isolate *isolate);
 
   // Casts the internal Isolate* type to the external Dart_Isolate type.
   static Dart_Isolate CastIsolate(Isolate* isolate);
 
   // Gets the handle used to designate successful return.
   static Dart_Handle Success(Isolate* isolate);
@@ skipping 42 matching lines @@
 
   // Gets a handle to False
   static Dart_Handle False(Isolate* isolate);
 
   // Retrieves the top ApiLocalScope.
   static ApiLocalScope* TopScope(Isolate* isolate);
 
   // Performs one-time initialization needed by the API.
   static void InitOnce();
 
+  // Allocates handles for objects in the VM isolate.
+  static void InitHandles();
+
   // Helper function to get the peer value of an external string object.
   static bool ExternalStringGetPeerHelper(Dart_Handle object, void** peer);
 
  private:
   // Thread local key used by the API. Currently holds the current
   // ApiNativeScope if any.
   static ThreadLocalKey api_native_key_;
+  static Dart_Handle true_handle_;
+  static Dart_Handle false_handle_;
+  static Dart_Handle null_handle_;
 
   friend class ApiNativeScope;
 };
 
 class IsolateSaver {
  public:
   explicit IsolateSaver(Isolate* current_isolate)
       : saved_isolate_(current_isolate) {
   }
   ~IsolateSaver() {
@@ skipping 14 matching lines @@
   isolate->DecrementNoCallbackScopeDepth()
 
 #define CHECK_CALLBACK_STATE(isolate)                                          \
   if (isolate->no_callback_scope_depth() != 0) {                               \
     return reinterpret_cast<Dart_Handle>(Api::AcquiredError(isolate));         \
   }                                                                            \
 
 }  // namespace dart.
 
 #endif  // VM_DART_API_IMPL_H_