Add external byte array API and finalize external strings and byte arrays.

runtime/vm/raw_object.h

 // 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.
 
 #ifndef VM_RAW_OBJECT_H_
 #define VM_RAW_OBJECT_H_
 
 #include "platform/assert.h"
 #include "vm/globals.h"
 #include "vm/snapshot.h"
@@ skipping 877 matching lines @@
   // Variable length data follows here.
   uint32_t data_[0];
 
   friend class SnapshotReader;
 };
 
 
 template<typename T>
 class ExternalStringData {
  public:
-  typedef void Callback(void* peer);
-  ExternalStringData(const T* data, void* peer, Callback* callback) :
+  ExternalStringData(const T* data, void* peer, Dart_PeerFinalizer callback) :
       data_(data), peer_(peer), callback_(callback) {
   }
+
+  ~ExternalStringData() {
+    if (callback_ != NULL) (*callback_)(peer_);
+  }
+
+  const T* data() {
+    return data_;
+  }
+  void* peer() {
+    return peer_;
+  }
+
+ private:
   const T* data_;
   void* peer_;
-  Callback* callback_;
+  Dart_PeerFinalizer callback_;
 };
 
 
 class RawExternalOneByteString : public RawString {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalOneByteString);
 
   ExternalStringData<uint8_t>* external_data_;
 };
 
 
@@ skipping 61 matching lines @@
   RAW_HEAP_OBJECT_IMPLEMENTATION(InternalByteArray);
 
   // Variable length data follows here.
   uint8_t* data() {
     uword address_of_length = reinterpret_cast<uword>(&length_);
     return reinterpret_cast<uint8_t*>(address_of_length + kWordSize);
   }
 };
 
 
+class ExternalByteArrayData {
+ public:
+  ExternalByteArrayData(uint8_t* data,
+                        void* peer,
+                        Dart_PeerFinalizer callback) :
+      data_(data), peer_(peer), callback_(callback) {
+  }
+
+  ~ExternalByteArrayData() {
+    if (callback_ != NULL) (*callback_)(peer_);
+  }
+
+  uint8_t* data() {
+    return data_;
+  }
+  void* peer() {
+    return peer_;
+  }
+
+ private:
+  uint8_t* data_;
+  void* peer_;
+  Dart_PeerFinalizer callback_;
+};
+
+
 class RawExternalByteArray : public RawByteArray {
   RAW_HEAP_OBJECT_IMPLEMENTATION(ExternalByteArray);
 
-  uint8_t* data_;
+  ExternalByteArrayData* external_data_;
 };
 
 
 class RawClosure : public RawInstance {
   RAW_HEAP_OBJECT_IMPLEMENTATION(Closure);
 
   RawObject** from() {
     return reinterpret_cast<RawObject**>(&ptr()->type_arguments_);
   }
   RawAbstractTypeArguments* type_arguments_;
@@ skipping 41 matching lines @@
   intptr_t type_;  // Uninitialized, simple or complex.
   intptr_t flags_;  // Represents global/local, case insensitive, multiline.
 
   // Variable length data follows here.
   uint8_t data_[0];
 };
 
 }  // namespace dart
 
 #endif  // VM_RAW_OBJECT_H_