Fixed upgrading and data binding

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 335 matching lines @@
 }
 
 
 /******************************************************************************
  **********                                                          **********
  **********                    JS Interop Support                    **********
  **********                                                          **********
  ******************************************************************************/
 
 // List of known tagName to DartClass for custom elements, used for upgrade.
-var _knownCustomeElements = new Map<String, Type>();
+var _knownCustomElements = new Map<String, Type>();
+
+// Return the tag name or is attribute of the custom element or data binding.
+String _getCustomElementName(element) {
+  var jsObject;
+  var tag = "";
+  var runtimeType = element.runtimeType;
+  if (runtimeType == HtmlElement) {
+    tag = element.localName;
+  } else if (runtimeType == TemplateElement) {
+    // Data binding with a Dart class.
+    tag = element.attributes['is'];
+  } else if (runtimeType == js.JsObjectImpl) {
+    // It's a Polymer core element (written in JS).
+    // Make sure it's an element anything else we can ignore.
+    if (element.hasProperty('nodeType') && element['nodeType'] == 1) {
+      if (js.JsNative.callMethod(element, 'hasAttribute', ['is'])) {
+        // It's data binding use the is attribute.
+        tag = js.JsNative.callMethod(element, 'getAttribute', ['is']);
+      } else {
+        // It's a custom element we want the local name.
+        tag = element['localName'];
+      }
+    }
+  } else {
+    throw new UnsupportedError('Element is incorrect type. Got ${runtimeType}, expected HtmlElement/HtmlTemplate/JsObjectImpl.');
+  }
+
+  return tag;
+}
 
 Rectangle make_dart_rectangle(r) =>
     r == null ? null : new Rectangle(
     js.JsNative.getProperty(r, 'left'),
     js.JsNative.getProperty(r, 'top'),
     js.JsNative.getProperty(r, 'width'),
     js.JsNative.getProperty(r, 'height'));
 
 /// An abstract class for all DOM objects we wrap in dart:html and related
 ///  libraries.
@@ skipping 22 matching lines @@
  * on the Dart class and return the created Dart class.
  */
 wrap_jso(jsObject) {
   try {
     if (jsObject is! js.JsObject || jsObject == null) {
       // JS Interop converted the object to a Dart class e.g., Uint8ClampedList.
       // or it's a simple type.
       return jsObject;
     }
 
-    // TODO(alanknight): With upgraded custom elements this causes a failure because
-    // we need a new wrapper after the type changes. We could possibly invalidate this
-    // if the constructor name didn't match?
     var wrapper = js.getDartHtmlWrapperFor(jsObject);
+    // if we have a wrapper and and it's an upgraded custom element return the Dart instance.
     if (wrapper != null) {
+      if (wrapper.runtimeType == HtmlElement && !wrapper._isBadUpgrade) {
+        // We're a Dart instance but we need to upgrade.
+        var tagName = _getCustomElementName(wrapper);
+        var customElementClass = _knownCustomElements[tagName];
+        if (customElementClass != null) {
+          var dartClass_instance;
+          try {
+            dartClass_instance = _blink.Blink_Utils.constructElement(customElementClass, jsObject);
+          } finally {
+            dartClass_instance.blink_jsObject = jsObject;
+            jsObject['dart_class'] = dartClass_instance;
+            js.setDartHtmlWrapperFor(jsObject, dartClass_instance);
+            return dartClass_instance;
+          }
+        }
+      }
+
       return wrapper;
     }
 
     if (jsObject is js.JsArray) {
       var wrappingList = new _DartHtmlWrappingList(jsObject);
       js.setDartHtmlWrapperFor(jsObject, wrappingList);
       return wrappingList;
     }
 
     // Try the most general type conversions on it.
@@ skipping 18 matching lines @@
       js.setDartHtmlWrapperFor(jsObject, jsObject);
       return jsObject;
     }
 
     var dartClass_instance;
     if (jsObject.hasProperty('dart_class')) {
       // Got a dart_class (it's a custom element) use it it's already set up
       // make sure it's upgraded.
       dartClass_instance = _upgradeHtmlElement(jsObject['dart_class']);
     } else {
-      var localName = jsObject['localName'];
-      var customElementClass = _knownCustomeElements[localName];
+      var tagName = _getCustomElementName(jsObject);
+      var customElementClass = _knownCustomElements[tagName];
       // Custom Element to upgrade.
       if (jsTypeName == 'HTMLElement' && customElementClass != null) {
         try {
           dartClass_instance = _blink.Blink_Utils.constructElement(customElementClass, jsObject);
         } finally {
           dartClass_instance.blink_jsObject = jsObject;
           jsObject['dart_class'] = dartClass_instance;
           js.setDartHtmlWrapperFor(jsObject, dartClass_instance);
        }
       } else {
+        // TODO(terry): Verify with jakemacd that this is right?
+        // If we every get an auto-binding we're matching previous non-JS Interop
+        // did to return a TemplateElement.
+        if (jsTypeName == 'auto-binding') {
+          jsTypeName = "HTMLTemplateElement";
+        }
+
         var func = getHtmlCreateFunction(jsTypeName);
         if (func != null) {
           dartClass_instance = func();
           dartClass_instance.blink_jsObject = jsObject;
           js.setDartHtmlWrapperFor(jsObject, dartClass_instance);
         }
       }
     }
     // TODO(jacobr): cache that this is not a dart:html JS class.
     return dartClass_instance;
@@ skipping 108 matching lines @@
   }
 }
 
 // Upgrade a Dart HtmlElement to the user's Dart custom element class.
 _upgradeHtmlElement(dartInstance) {
   // Only try upgrading HtmlElement (Dart class) if there is a failure then
   // don't try it again - one failure is enough.
   if (dartInstance.runtimeType == HtmlElement && !dartInstance._isBadUpgrade) {
     // Must be exactly HtmlElement not something derived from it.
     var jsObject = dartInstance.blink_jsObject;
-    var localName = dartInstance.localName;
-    var customElementClass = _knownCustomeElements[localName];
+    var tagName = _getCustomElementName(dartInstance);
+    var customElementClass = _knownCustomElements[tagName];
     // Custom Element to upgrade.
     if (customElementClass != null) {
       try {
         dartInstance = _blink.Blink_Utils.constructElement(customElementClass, jsObject);
       } catch (e) {
         dartInstance._badUpgrade();
       } finally {
         dartInstance.blink_jsObject = jsObject;
         jsObject['dart_class'] = dartInstance;
         js.setDartHtmlWrapperFor(jsObject, dartInstance);
@@ skipping 109 matching lines @@
 
 unwrap_jso(dartClass_instance) => dartClass_instance;
 wrap_jso(jsObject) => jsObject;
 make_dart_rectangle(r) => r;
 convertDartToNative_Dictionary(Map dict) => dict;
 List convertDartToNative_StringArray(List<String> input) => input;
 convertDartToNative_List(List input) => input;
 createCustomUpgrader(Type customElementClass, $this) => $this;
 
 $endif