Rename JS_CURRENT_ISOLATE to JS_CURRENT_ISOLATE_CONTEXT.

dart/sdk/lib/_internal/compiler/implementation/lib/isolate_helper.dart

 // 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.
 
 library _isolate_helper;
 
 import 'dart:async';
 import 'dart:collection' show Queue, HashMap;
 import 'dart:isolate';
 import 'dart:_js_helper' show convertDartClosureToJS,
                               Null;
 import 'dart:_foreign_helper' show DART_CLOSURE_TO_JS,
                                    JS,
                                    JS_CREATE_ISOLATE,
+                                   JS_CURRENT_ISOLATE_CONTEXT,
                                    JS_CURRENT_ISOLATE,
                                    JS_SET_CURRENT_ISOLATE,
                                    IsolateContext;
 
 ReceivePort lazyPort;
 
 class CloseToken {
   /// This token is sent from [IsolateSink]s to [IsolateStream]s to ask them to
   /// close themselves.
   const CloseToken();
@@ skipping 393 matching lines @@
   static String thisScript = computeThisScript();
 
   /// Associates an ID with a native worker object.
   static final Expando<int> workerIds = new Expando<int>();
 
   /**
    * The src url for the script tag that loaded this code. Used to create
    * JavaScript workers.
    */
   static String computeThisScript() {
-    var currentScript = JS('', r'$.$currentScript');
+    var currentScript = JS('', r'#.$currentScript', JS_CURRENT_ISOLATE());
     if (currentScript != null) {
       return JS('String', 'String(#.src)', currentScript);
     }
 
     // TODO(ahe): The following is for supporting command-line engines
     // such as d8 and jsshell. We should move this code to a helper
     // library that is only loaded when testing on those engines.
 
     var stack = JS('String|Null', 'new Error().stack');
     if (stack == null) {
@@ skipping 109 matching lines @@
       }
     }
   }
 
   static void _consoleLog(msg) {
     JS("void", r"#.console.log(#)", globalThis, msg);
   }
 
   /** Find a constructor given its name. */
   static dynamic _getJSConstructorFromName(String factoryName) {
-    return JS("", r"$[#]", factoryName);
+    return JS("", "#[#]", JS_CURRENT_ISOLATE(), factoryName);
   }
 
   static dynamic _getJSFunctionFromName(String functionName) {
-    return JS("", r"$[#]", functionName);
+    return JS("", "#[#]", JS_CURRENT_ISOLATE(), functionName);
   }
 
   /**
    * Get a string name for the function, if possible.  The result for
    * anonymous functions is browser-dependent -- it may be "" or "anonymous"
    * but you should probably not count on this.
    */
   static String _getJSFunctionName(Function f) {
     return JS("String|Null", r"(#['$name'] || #)", f, null);
   }
@@ skipping 837 matching lines @@
         JS('void', '#.clearInterval(#)', globalThis, _handle);
       }
       _handle = null;
     } else {
       throw new UnsupportedError("Canceling a timer.");
     }
   }
 }
 
 bool hasTimer() => JS('', '#.setTimeout', globalThis) != null;