Fix broken code passing typed data from Dart to V8. Attempted to match patterns in SerializeScriptV…

Source/bindings/core/dart/DartJsInterop.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 319 matching lines @@
     }
 };
 
 PassRefPtr<JsObject> JsObject::create(v8::Local<v8::Object> v8Handle)
 {
     return adoptRef(new JsObject(v8Handle));
 }
 
 v8::Local<v8::Value> JsInterop::fromDart(DartDOMData* domData, Dart_Handle handle, Dart_Handle& exception)
 {
+    v8::Isolate* v8Isolate = v8::Isolate::GetCurrent();
     v8::Handle<v8::Value> value = V8Converter::toV8IfPrimitive(domData, handle, exception);
     if (!value.IsEmpty() || exception)
         return value;
 
     Dart_Handle jso = invokeTopLevelJsInteropMethod(domData, "unwrap_jso", 1, &handle);
     ASSERT(!Dart_IsError(jso));
     if (DartDOMWrapper::subtypeOf(jso, JsObject::dartClassId)) {
         JsObject* object = DartDOMWrapper::unwrapDartWrapper<JsObject>(domData, jso, exception);
         if (exception)
             return v8::Local<v8::Value>();
         return object->localV8Object();
     }
     // TODO(terry): START of uncommented block by Jacob, I've re-enabled for clamped arrays...
     value = V8Converter::toV8IfBrowserNative(domData, handle, exception);
     if (!value.IsEmpty() || exception)
         return value;
 
     if (DartUtilities::isFunction(domData, handle)) {
         v8::Local<v8::Object> functionProxy = dartFunctionTemplate()->InstanceTemplate()->NewInstance();
         DartHandleProxy::writePointerToProxy(functionProxy, handle);
         // The raw functionProxy doesn't behave enough like a true JS function
         // so we wrap it in a true JS function.
-        return domData->jsInteropData()->wrapDartFunction()->Call(functionProxy, 0, 0);
+        v8::Local<v8::Function> object = domData->jsInteropData()->wrapDartFunction()->Call(functionProxy, 0, 0).As<v8::Function>();
+
+        v8::Local<v8::String> existingDartWrapperKey = domData->jsInteropData()->existingDartWrapperHiddenField(v8Isolate);
+        v8::Local<v8::Object> containerForDartHandle = dartObjectTemplate()->InstanceTemplate()->NewInstance();
+        DartHandleProxy::writePointerToProxy(containerForDartHandle, handle);
+        object->SetHiddenValue(existingDartWrapperKey, containerForDartHandle);
+        return object;
     }
 
     v8::Local<v8::Object> proxy;
     ASSERT(Dart_IsInstance(handle));
     // Simulate the behavior of the Dart dev compiler where new List() is
     // equivalent to a JavaScript array. We accomplish this by creating a
     // JavaScript object that fakes that it is a JavaScript array but is
     // actually backed by a Dart list. This is not a breaking change as
     // existing Dart-JS interop passed arrays as opaque Dart handles.
     // The jsify method can still be called if you wish to create a copy
     // of a json like Dart data structure.
     if (Dart_IsList(handle)) {
         proxy = dartListTemplate()->InstanceTemplate()->NewInstance();
     } else {
         proxy = dartObjectTemplate()->InstanceTemplate()->NewInstance();
     }
     DartHandleProxy::writePointerToProxy(proxy, handle);
-    v8::Isolate* v8Isolate = v8::Isolate::GetCurrent();
     proxy->SetHiddenValue(v8::String::NewFromUtf8(v8Isolate, "dartProxy"), v8::Boolean::New(v8Isolate, true));
 
     return proxy;
 }
 
 // Given a Blink Element instance, make it a V8Object that can then be returned
 // as a Dart JsObject that holds the Javascript object (V8Object).
 void JsInterop::returnBlinkElement(Element* value, Dart_NativeArguments args, Dart_Handle& exception)
 {
     JsInteropScopes scopes(args);
@@ skipping 68 matching lines @@
     return JsObject::toDart(object, sometimesUseHtml);
 }
 
 Dart_Handle JsObject::toDart(v8::Local<v8::Object> object, bool sometimesUseHtml)
 {
     Dart_Handle wrapper;
     v8::Isolate* v8Isolate = v8::Isolate::GetCurrent();
     DartDOMData* domData = DartDOMData::current();
     DartJsInteropData* interopData = domData->jsInteropData();
     v8::Local<v8::String> existingDartWrapperKey = interopData->existingDartWrapperHiddenField(v8Isolate);
-
-    // TODO(alanknight): This will fail for multiple isolates referencing the same JS object.
-    // We probably need to use a different property name for different isolates.
     v8::Local<v8::Value> hiddenValue = object->GetHiddenValue(existingDartWrapperKey);
 
     if (*hiddenValue && hiddenValue->IsObject()) {
         DartPersistentValue* scriptValue = DartHandleProxy::readPointerFromProxy(hiddenValue.As<v8::Object>());
         ASSERT(scriptValue->isIsolateAlive());
         // If the isolate does not match we fall back to using the existing JS
         // wrapper for the Dart object so that simple cases that would work in
         // Dart2Js work. We could alternately throw an exception here.
         if (scriptValue->isolate() == Dart_CurrentIsolate()) {
             Dart_Handle wrapper = scriptValue->value();
@@ skipping 1338 matching lines @@
 {
     JsInteropInternal::callMethodCallback(args);
 }
 
 void JsInterop::jsInteropContextCallback(Dart_NativeArguments args)
 {
     return JsInteropInternal::contextCallback(args);
 }
 
 }