Code review changes for r25379

sdk/lib/_internal/lib/native_helper.dart

Index: sdk/lib/_internal/lib/native_helper.dart
diff --git a/sdk/lib/_internal/lib/native_helper.dart b/sdk/lib/_internal/lib/native_helper.dart
index 4c66f658aaf7208225c04588f23036b0c8746433..5c311f4f69196f764bb7acc1d9aec14534964db1 100644
--- a/sdk/lib/_internal/lib/native_helper.dart
+++ b/sdk/lib/_internal/lib/native_helper.dart
@@ -139,36 +139,27 @@ newJsObject() {
   return JS('var', '{}');
 }
 
-/**
- * Cached value for the function to use to get the type name of an
- * object.
- */
-Function _getTypeNameOf;
-
-/**
- * Returns the type name of [obj].
- */
-String getTypeNameOf(var obj) {
-  if (_getTypeNameOf == null) _getTypeNameOf = getFunctionForTypeNameOf();
-  return _getTypeNameOf(obj);
-}
+Function getTypeNameOf = getFunctionForTypeNameOf();

[ahe, 2013/07/26 10:22:07]

final?

 
 /**
  * Returns the function to use to get the type name (i.e. dispatch tag) of an
  * object.
  */
 Function getFunctionForTypeNameOf() {
-  var getTagFunction = _getFunctionForTypeNameOf();
+  var getTagFunction = getBaseFunctionForTypeNameOf();
   if (JS('bool', 'typeof dartExperimentalFixupGetTag == "function"')) {
-    return _applyExperimentalFixup(
+    return applyExperimentalFixup(
         JS('', 'dartExperimentalFixupGetTag'), getTagFunction);
   }
   return getTagFunction;
 }
 
-Function _getFunctionForTypeNameOf() {
+/// Don't call directly, use [getFunctionForTypeNameOf] instead.
+Function getBaseFunctionForTypeNameOf() {
   // If we're not in the browser, we're almost certainly running on v8.
-  if (!identical(JS('String', 'typeof(navigator)'), 'object')) return typeNameInChrome;
+  if (!identical(JS('String', 'typeof(navigator)'), 'object')) {
+    return typeNameInChrome;
+  }
 
   String userAgent = JS('String', "navigator.userAgent");
   // TODO(antonm): remove a reference to DumpRenderTree.
@@ -191,15 +182,14 @@ Function _getFunctionForTypeNameOf() {
   }
 }
 
-Function _applyExperimentalFixup(fixupJSFunction,
-                                 Function originalGetTagFunction) {
-  // Since DART_CLOSURE_TO_JS works only for top level functions, store the
-  // closed over JavaScript function in a top level variable and use a top level
-  // function.  This is fine since we have only one instance of the 'closure'.
-  _getTagJSFunction = originalGetTagFunction;
+Function applyExperimentalFixup(fixupJSFunction,
+                                Function originalGetTagDartFunction) {
+  var originalGetTagJSFunction =
+      convertDartClosure1ArgToJSNoDataConversions(
+          originalGetTagDartFunction);
+
   var newGetTagJSFunction =
-      JS('', '#(#)',
-         fixupJSFunction, DART_CLOSURE_TO_JS(_callGetTagJSFunction));
+      JS('', '#(#)', fixupJSFunction, originalGetTagJSFunction);
 
   String newGetTagDartFunction(object) =>
       JS('', '#(#)', newGetTagJSFunction, object);
@@ -207,10 +197,15 @@ Function _applyExperimentalFixup(fixupJSFunction,
   return newGetTagDartFunction;
 }
 
-var _getTagJSFunction;
-_callGetTagJSFunction(object) => _getTagJSFunction(object);
-
+callDartFunctionWith1Arg(fn, arg) => fn(arg);
 
+convertDartClosure1ArgToJSNoDataConversions(dartClosure) {
+  return JS('',
+      '(function(invoke, closure){'
+        'return function(arg){ return invoke(closure, arg); };'
+      '})(#, #)',
+      DART_CLOSURE_TO_JS(callDartFunctionWith1Arg), dartClosure);
+}
 
 
 String toStringForNativeObject(var obj) {