Fixed few more issues with upgrader and custom event identitiy

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 402 matching lines @@
     if (__interop_checks) {
       debug_or_assert("constructor != null", constructor != null);
     }
     var jsTypeName = constructor['name'];
     if (__interop_checks) {
       debug_or_assert("constructor != null && jsTypeName.length > 0", constructor != null && jsTypeName.length > 0);
     }
 
     var dartClass_instance;
     if (jsObject.hasProperty('dart_class')) {
-      // Got a dart_class (it's a custom element) use it it's already set up.
-      dartClass_instance = jsObject['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];
       // 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;
@@ skipping 53 matching lines @@
         window.console.log("${e.message}\n ${stacktrace}");
       else
         window.console.log("${stacktrace}");
     }
 
     // Problem?
     return null;
   }
 }
 
+// Upgrade a Dart HtmlElement to the user's Dart custom element class.
+_upgradeHtmlElement(dartInstance) {
+  var dartInstanceMirror = reflect(dartInstance);
+  if (dartInstanceMirror.type.qualifiedName == #dart.dom.html.HtmlElement) {

[Alan Knight, 2015/10/07 16:21:29]

Could you do this with dartInstance.runtimeType == HtmlElement rather than using
mirrors?

+    // Must be exactly HtmlElement not something derived from it.
+    var jsObject = dartInstance.blink_jsObject;
+    var localName = dartInstance.localName;
+    var customElementClass = _knownCustomeElements[localName];
+    // Custom Element to upgrade.
+    if (customElementClass != null) {
+      try {
+        dartInstance = _blink.Blink_Utils.constructElement(customElementClass, jsObject);
+      } finally {
+        dartInstance.blink_jsObject = jsObject;
+        jsObject['dart_class'] = dartInstance;
+        js.setDartHtmlWrapperFor(jsObject, dartInstance);
+     }
+   }
+  }
+
+  return dartInstance;
+}
+
 class DebugAssertException implements Exception {
   String message;
   DebugAssertException(this.message);
 }
 
 debug_or_assert(message, expression) {
   if (!expression) {
     throw new DebugAssertException("$message");
   }
 }
@@ skipping 91 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