Re-try of Tightening up dart2js load timing.

pkg/browser/lib/dart.js

Index: pkg/browser/lib/dart.js
diff --git a/pkg/browser/lib/dart.js b/pkg/browser/lib/dart.js
index 48cd8ad63b5aedb0a3f4a5a5cd611f1fa5a62c14..b96581c5396fa05eef4adb548ef1fc4a98432669 100644
--- a/pkg/browser/lib/dart.js
+++ b/pkg/browser/lib/dart.js
@@ -2,6 +2,7 @@
 // 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.
 
+(function() {
 // Bootstrap support for Dart scripts on the page as this script.
 if (navigator.webkitStartDart) {
   if (!navigator.webkitStartDart()) {
@@ -11,28 +12,28 @@ if (navigator.webkitStartDart) {
   // TODO:
   // - Support in-browser compilation.
   // - Handle inline Dart scripts.
-  window.addEventListener("DOMContentLoaded", function (e) {
-    // Fall back to compiled JS. Run through all the scripts and
-    // replace them if they have a type that indicate that they source
-    // in Dart code.
-    //
-    //   <script type="application/dart" src="..."></script>
-    //
-    var scripts = document.getElementsByTagName("script");
-    var length = scripts.length;
-    for (var i = 0; i < length; ++i) {
-      if (scripts[i].type == "application/dart") {
-        // Remap foo.dart to foo.dart.js.
-        if (scripts[i].src && scripts[i].src != '') {
-          var script = document.createElement('script');
-          script.src = scripts[i].src.replace(/\.dart(?=\?|$)/, '.dart.js');
-          var parent = scripts[i].parentNode;
-          // TODO(vsm): Find a solution for issue 8455 that works with more
-          // than one script.
-          document.currentScript = script;
-          parent.replaceChild(script, scripts[i]);
-        }
+
+  // Fall back to compiled JS. Run through all the scripts and
+  // replace them if they have a type that indicate that they source
+  // in Dart code.
+  //
+  //   <script type="application/dart" src="..."></script>
+  //
+  var scripts = document.getElementsByTagName("script");
+  var length = scripts.length;
+  for (var i = 0; i < length; ++i) {
+    if (scripts[i].type == "application/dart") {
+      // Remap foo.dart to foo.dart.js.
+      if (scripts[i].src && scripts[i].src != '') {
+        var script = document.createElement('script');
+        script.src = scripts[i].src.replace(/\.dart(?=\?|$)/, '.dart.js');
+        var parent = scripts[i].parentNode;

[blois, 2013/08/15 21:38:48]

This parent variable was leaking to the window, overriding window.parent.

This then broke test_controller.js, which has:
function getDriverWindow() {
  if (window != window.parent) {
    // We're running in an iframe.
    return window.parent;
  } else if (window.opener) {
    // We were opened by another window.
    return window.opener;
  }
  return null;
}

window.parent was 'undefined', and so this function returned undefined and test
messages were not getting sent.

+        // TODO(vsm): Find a solution for issue 8455 that works with more
+        // than one script.
+        document.currentScript = script;
+        parent.replaceChild(script, scripts[i]);
       }
     }
-  }, false);
+  }
 }
+})();