Revert "Revert "Fix handling of cross-origin windows in dartium and better align general handling o…

tools/dom/templates/html/dartium/html_dartium.darttemplate

 // 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.
 
 // DO NOT EDIT
 // Auto-generated dart:html library.
 
 /**
  * HTML elements and other resources for web-based applications that need to
  * interact with the browser and the DOM (Document Object Model).
@@ skipping 238 matching lines @@
   return null;
 }
 
 Type _getSvgType(String key) {
   if (svgBlinkMap.containsKey(key)) {
     return svgBlinkMap[key]();
   }
   return null;
 }
 
-// TODO(jacobr): it would be nice to place this in a consistent place for dart2js and dartium.
+// TODO(jacobr): it would be nice to place these conversion methods in a consistent place for dart2js and dartium.
+
+WindowBase _convertNativeToDart_Window(win) {
+  if (win == null) return null;
+  return _DOMWindowCrossFrame._createSafe(win);
+}
+
+EventTarget _convertNativeToDart_EventTarget(e) {
+  if (e == null) {
+    return null;
+  }
+  // Assume it's a Window if it contains the postMessage property.  It may be
+  // from a different frame - without a patched prototype - so we cannot
+  // rely on Dart type checking.
+  try {
+    if (js.JsNative.hasProperty(e, "postMessage")) {
+      var window = _DOMWindowCrossFrame._createSafe(e);
+      // If it's a native window.
+      if (window is EventTarget) {
+        return window;
+      }
+      return null;
+    }
+  } catch (err) {
+    print("Error calling _convertNativeToDart_EventTarget... $err");
+  }
+  return e;
+}
+
+EventTarget _convertDartToNative_EventTarget(e) {
+  // _DOMWindowCrossFrame uses an interceptor so we don't need to do anything unlike Dart2Js.
+  return e;
+}
+
 _convertNativeToDart_XHR_Response(o) {
   if (o is Document) {
     return o;
   }
   return convertNativeToDart_SerializedScriptValue(o);
 }
 
 $if JSINTEROP
 
 /******************************************************************************
@@ skipping 44 matching lines @@
   DebugAssertException(this.message);
 }
 
 @Deprecated("Internal Use Only")
 debug_or_assert(message, expression) {
   if (!expression) {
     throw new DebugAssertException("$message");
   }
 }
 
-// TODO(jacobr): we shouldn't be generating this call in the dart:html
-// bindings but we are.
-_convertDartToNative_EventTarget(target) => target;
-
 @Deprecated("Internal Use Only")
 Map<String, dynamic> convertNativeObjectToDartMap(js.JsObject jsObject) {
   var result = new Map();
   var keys = js.JsNative.callMethod(js.JsNative.getProperty(js.context, 'Object'), 'keys', [jsObject]);
   for (var key in keys) {
     result[key] = js.JsNative.getProperty(jsObject, key);
   }
   return result;
 }
 
 /**
  * Upgrade the JS HTMLElement to the Dart class.  Used by Dart's Polymer.
  */
 _createCustomUpgrader(Type customElementClass, $this) {
   return _blink.Blink_Utils.setInstanceInterceptor($this, customElementClass, customElement: true);
 }
 
 $else
 class DartHtmlDomObject extends NativeFieldWrapperClass2 {}
 
 _createCustomUpgrader(Type customElementClass, $this) => $this;
 
 $endif