Run Dart closures invoked from JS in the correct Zone

Source/bindings/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 62 matching lines @@
     }
 }
 
 static void functionInvocationCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
 {
     DartScopes scopes(args.Holder());
     Dart_Handle handle = scopes.handle;
     DartDOMData* domData = DartDOMData::current();
     ASSERT(domData);
     ASSERT(DartUtilities::isFunction(domData, handle));
+    ASSERT(args.Length() == 1 || args.Length() == 2);
 
-    Vector<Dart_Handle> dartFunctionArgs;
-    ASSERT(args.Length() == 1 || args.Length() == 2);
+    v8::Local<v8::Array> argsList = args[args.Length()-1].As<v8::Array>();
+    uint32_t argsListLength = argsList->Length();
+    Dart_Handle dartFunctionArgs;
+    uint32_t offset = 0;
     // If there is 1 argument, we assume it is a v8:Array or arguments, if
     // there are 2 arguments, the first argument is "this" and the second
     // argument is an array of arguments.
-    if (args.Length() > 1) {
-        dartFunctionArgs.append(JsInterop::toDart(args[0]));
+    if (args.Length() == 1) {
+        dartFunctionArgs = Dart_NewList(argsListLength);
+    } else {
+        dartFunctionArgs = Dart_NewList(argsListLength + 1);
+        Dart_ListSetAt(dartFunctionArgs, offset++, JsInterop::toDart(args[0]));
     }
 
-    v8::Local<v8::Array> argsList = args[args.Length()-1].As<v8::Array>();
-    uint32_t argsListLength = argsList->Length();
     for (uint32_t i = 0; i < argsListLength; i++) {
-        dartFunctionArgs.append(JsInterop::toDart(argsList->Get(i)));
+        Dart_ListSetAt(dartFunctionArgs, i + offset, JsInterop::toDart(argsList->Get(i)));

[Jacob, 2014/04/16 22:27:55]

nit: keep the style consistent and replace
i + offset with
offset++

     }
 
-    setJsReturnValue(domData, args, Dart_InvokeClosure(handle, dartFunctionArgs.size(), dartFunctionArgs.data()));
+    setJsReturnValue(domData, args, Dart_InvokeClosure(handle, 1, &dartFunctionArgs));
 }
 
 static v8::Local<v8::ObjectTemplate> setupInstanceTemplate(v8::Local<v8::FunctionTemplate> proxyTemplate)
 {
     v8::Local<v8::ObjectTemplate> instanceTemplate = proxyTemplate->InstanceTemplate();
     instanceTemplate->SetInternalFieldCount(1);
     return instanceTemplate;
 }
 
 static v8::Local<v8::FunctionTemplate> dartFunctionTemplate()
@@ skipping 99 matching lines @@
     if (!value.IsEmpty() || exception)
         return value;
 
     if (DartDOMWrapper::subtypeOf(handle, JsObject::dartClassId)) {
         JsObject* object = DartDOMWrapper::unwrapDartWrapper<JsObject>(domData, handle, exception);
         if (exception)
             return v8::Local<v8::Value>();
         return object->localV8Object();
     }
 
     if (DartUtilities::isFunction(domData, handle)) {

[Jacob, 2014/04/16 22:27:55]

add a TODO to remove this isFunction check and switch to two native methods one
that takes functions and one that takes all other objects.

         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> jsFunction = v8::Local<v8::Function>::Cast(domData->jsInteropData()->wrapDartFunction()->Call(functionProxy, 0, 0));
+        DartHandleProxy::writePointerToProxy(jsFunction, handle);
+        v8::Isolate* v8Isolate = v8::Isolate::GetCurrent();
+        jsFunction->SetHiddenValue(v8::String::NewFromUtf8(v8Isolate, "dartProxy"), v8::Boolean::New(v8Isolate, true));
+        return jsFunction;
     }
 
     v8::Local<v8::Object> proxy;
     ASSERT(Dart_IsInstance(handle));
     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;
@@ skipping 18 matching lines @@
         return handle;
 
     ASSERT(v8Handle->IsObject());
     v8::Handle<v8::Object> object = v8Handle.As<v8::Object>();
     Dart_Handle exception = 0;
     handle = V8Converter::toDartIfBrowserNative(object, object->CreationContext()->GetIsolate(), exception);
     ASSERT(!exception);
     if (handle)
         return handle;
 
-    // Unwrap objects passed from Dart to JS that are being passed back to
-    // Dart. FIXME: we do not yet handle unwrapping JS functions passed
-    // from Dart to JS as we have to wrap them with true JS Function objects.
-    // If this use case is important we can support it at the cost of hanging
-    // an extra expando off the JS function wrapping the Dart function.
+    // Unwrap objects passed from Dart to JS that are being passed back to Dart.
     if (DartHandleProxy::isDartProxy(v8Handle)) {
         DartScriptValue* scriptValue = DartHandleProxy::readPointerFromProxy(v8Handle);
         ASSERT(scriptValue->isIsolateAlive());
         return scriptValue->value();
     }
 
     return JsObject::toDart(object);
 }
 
 Dart_Handle JsObject::toDart(v8::Local<v8::Object> object)
@@ skipping 770 matching lines @@
     if (argumentCount == 1 && name == "JsArray_length")
         return JsInteropInternal::jsArrayLengthCallback;
 
     if (argumentCount == 1 && name == "JsObject_fromBrowserObject")
         return JsInteropInternal::fromBrowserObjectCallback;
 
     return 0;
 }
 
 }