Fix dartbug.com/10674:

runtime/vm/dart_api_impl.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 "include/dart_api.h"
 
 #include "platform/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
@@ skipping 2470 matching lines @@
 
 static Dart_Handle NewTypedData(Isolate* isolate,
                                 intptr_t cid,
                                 intptr_t length) {
   CHECK_LENGTH(length, TypedData::MaxElements(cid));
   return Api::NewHandle(isolate, TypedData::New(cid, length));
 }
 
 
 static Dart_Handle NewExternalTypedData(
+    Isolate* isolate,
     intptr_t cid,
     void* data,
     intptr_t length,
     void* peer,
     Dart_WeakPersistentHandleFinalizer callback) {
   CHECK_LENGTH(length, ExternalTypedData::MaxElements(cid));
-  const ExternalTypedData& obj = ExternalTypedData::Handle(
-      ExternalTypedData::New(cid,
-                             reinterpret_cast<uint8_t*>(data),
-                             length));
-  return reinterpret_cast<Dart_Handle>(obj.AddFinalizer(peer, callback));
+  const ExternalTypedData& result = ExternalTypedData::Handle(

[siva, 2013/05/16 18:28:18]

isolate,

here too since it is available.

+      ExternalTypedData::New(cid, reinterpret_cast<uint8_t*>(data), length));
+  result.AddFinalizer(peer, callback);
+  return Api::NewHandle(isolate, result.raw());
 }
 
 
 static Dart_Handle NewExternalByteData(Isolate* isolate,
                                        void* data,
                                        intptr_t length,
                                        void* peer,
                                        Dart_WeakPersistentHandleFinalizer cb) {
-  Dart_Handle ext_data = NewExternalTypedData(kExternalTypedDataUint8ArrayCid,
+  Dart_Handle ext_data = NewExternalTypedData(isolate,
+                                              kExternalTypedDataUint8ArrayCid,
                                               data,
                                               length,
                                               peer,
                                               cb);
   if (::Dart_IsError(ext_data)) {
     return ext_data;
   }
   Object& result = Object::Handle(isolate);
   result = GetByteDataConstructor(isolate, Symbols::ByteDataDotview(), 3);
   ASSERT(!result.IsNull());
@@ skipping 72 matching lines @@
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
   if (data == NULL && length != 0) {
     RETURN_NULL_ERROR(data);
   }
   CHECK_CALLBACK_STATE(isolate);
   switch (type) {
     case kByteData:
       return NewExternalByteData(isolate, data, length, peer, callback);
     case kInt8:
-      return NewExternalTypedData(kExternalTypedDataInt8ArrayCid,
+      return NewExternalTypedData(isolate,
+                                  kExternalTypedDataInt8ArrayCid,
                                   data,
                                   length,
                                   peer,
                                   callback);
     case kUint8:
-      return NewExternalTypedData(kExternalTypedDataUint8ArrayCid,
+      return NewExternalTypedData(isolate,
+                                  kExternalTypedDataUint8ArrayCid,
                                   data,
                                   length,
                                   peer,
                                   callback);
     case kUint8Clamped:
-      return NewExternalTypedData(kExternalTypedDataUint8ClampedArrayCid,
+      return NewExternalTypedData(isolate,
+                                  kExternalTypedDataUint8ClampedArrayCid,
                                   data,
                                   length,
                                   peer,
                                   callback);
     case kInt16:
-      return NewExternalTypedData(kExternalTypedDataInt16ArrayCid,
+      return NewExternalTypedData(isolate,
+                                  kExternalTypedDataInt16ArrayCid,
                                   data,
                                   length,
                                   peer,
                                   callback);
     case kUint16:
-      return NewExternalTypedData(kExternalTypedDataUint16ArrayCid,
+      return NewExternalTypedData(isolate,
+                                  kExternalTypedDataUint16ArrayCid,
                                   data,
                                   length,
                                   peer,
                                   callback);
     case kInt32:
-      return NewExternalTypedData(kExternalTypedDataInt32ArrayCid,
+      return NewExternalTypedData(isolate,
+                                  kExternalTypedDataInt32ArrayCid,
                                   data,
                                   length,
                                   peer,
                                   callback);
     case kUint32:
-      return NewExternalTypedData(kExternalTypedDataUint32ArrayCid,
+      return NewExternalTypedData(isolate,
+                                  kExternalTypedDataUint32ArrayCid,
                                   data,
                                   length,
                                   peer,
                                   callback);
     case kInt64:
-      return NewExternalTypedData(kExternalTypedDataInt64ArrayCid,
+      return NewExternalTypedData(isolate,
+                                  kExternalTypedDataInt64ArrayCid,
                                   data,
                                   length,
                                   peer,
                                   callback);
     case kUint64:
-      return NewExternalTypedData(kExternalTypedDataUint64ArrayCid,
+      return NewExternalTypedData(isolate,
+                                  kExternalTypedDataUint64ArrayCid,
                                   data,
                                   length,
                                   peer,
                                   callback);
     case kFloat32:
-      return NewExternalTypedData(kExternalTypedDataFloat32ArrayCid,
+      return NewExternalTypedData(isolate,
+                                  kExternalTypedDataFloat32ArrayCid,
                                   data,
                                   length,
                                   peer,
                                   callback);
     case kFloat64:
-      return NewExternalTypedData(kExternalTypedDataFloat64ArrayCid,
+      return NewExternalTypedData(isolate,
+                                  kExternalTypedDataFloat64ArrayCid,
                                   data,
                                   length,
                                   peer,
                                   callback);
     case kFloat32x4:
-      return NewExternalTypedData(kExternalTypedDataFloat32x4ArrayCid,
+      return NewExternalTypedData(isolate,
+                                  kExternalTypedDataFloat32x4ArrayCid,
                                   data,
                                   length,
                                   peer,
                                   callback);
     default:
       return Api::NewError("%s expects argument 'type' to be of"
                            " 'external TypedData'", CURRENT_FUNC);
   }
   UNREACHABLE();
   return Api::Null(isolate);
@@ skipping 2176 matching lines @@
   }
   {
     NoGCScope no_gc;
     RawObject* raw_obj = obj.raw();
     isolate->heap()->SetPeer(raw_obj, peer);
   }
   return Api::Success(isolate);
 }
 
 }  // namespace dart