Fixed checking for more complex inheritance

tools/dom/templates/html/impl/impl_HTMLDocument.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.
 
 // WARNING: Do not edit - generated code.
 
 part of $LIBRARYNAME;
 
 $(ANNOTATIONS)$(NATIVESPEC)$(CLASS_MODIFIERS)class $CLASSNAME$EXTENDS$IMPLEMENTS {
 $!MEMBERS
@@ skipping 181 matching lines @@
   /**
    * Internal routine to find the DOM JS class name being extended for custom
    * elements.
    */
   String _getJSClassName(ClassMirror classMirror) {
     var jsClassName = null;
     var isElement = false;
 
     while (classMirror.superclass != null) {
       var fullName = classMirror.superclass.qualifiedName;
-      isElement = isElement || (fullName == #dart.dom.html.Element);
+      isElement = isElement ||
+          (fullName == #dart.dom.html.Element || fullName == #dart.dom.svg.Element);
 
       var domLibrary = MirrorSystem.getName(fullName).startsWith('dart.dom.');
       if (jsClassName == null && domLibrary) {
         // Lookup JS class name (if not found).
         var metadatas = classMirror.metadata;
         for (var metadata in metadatas) {
           var metaDataMirror = metadata.reflectee;
           var metaType = reflectClass(metaDataMirror.runtimeType);
           if (MirrorSystem.getName(metaType.simpleName) == 'DomName' &&
-              metaDataMirror.name.startsWith('HTML')) {
+              (metaDataMirror.name.startsWith('HTML') || metaDataMirror.name.startsWith('SVG'))) {
             jsClassName = metadata.reflectee.name;
           }
         }
       }
 
       classMirror = classMirror.superclass;
     }
 
     // If we're an element then everything is okay.
     return isElement ? jsClassName : null;
   }
 
   /**
+   * Get the class that immediately derived from a class in dart:html or
+   * dart:svg (has an attribute DomName of either HTML* or SVG*).
+   */
+  ClassMirror _getDomSuperClass(ClassMirror classMirror) {
+    var isElement = false;
+
+    while (classMirror.superclass != null) {
+      var fullName = classMirror.superclass.qualifiedName;
+      isElement = isElement || (fullName == #dart.dom.html.Element || fullName == #dart.dom.svg.Element);
+
+      var domLibrary = MirrorSystem.getName(fullName).startsWith('dart.dom.');
+      if (domLibrary) {
+        // Lookup JS class (if not found).
+        var metadatas = classMirror.metadata;
+        for (var metadata in metadatas) {
+          var metaDataMirror = metadata.reflectee;
+          var metaType = reflectClass(metaDataMirror.runtimeType);
+          if (MirrorSystem.getName(metaType.simpleName) == 'DomName' &&
+              (metaDataMirror.name.startsWith('HTML') || metaDataMirror.name.startsWith('SVG'))) {

[Alan Knight, 2015/09/28 22:31:42]

Aren't there classes in HTML that don't start with HTML? And why only those two.
What about web_gl or web_audio, etc?

+            if (isElement) return classMirror;
+          }
+        }
+      }
+
+      classMirror = classMirror.superclass;
+    }
+
+    return null;
+  }
+
+  /**
    * Does this CustomElement class have:
    *
    *   - a created constructor with no arguments?
    *   - a created constructor with a super.created() initializer?
    *
    * e.g.,    MyCustomClass.created() : super.created();
    */
-  bool _hasCreatedConstructor(ClassMirror classMirror) {
-    var createdParametersValid = false;
-    var superCreatedCalled = false;
-    var className = MirrorSystem.getName(classMirror.simpleName);
-    var methodMirror = classMirror.declarations[new Symbol("$className.created")];
-    if (methodMirror != null) {
-      createdParametersValid = methodMirror.parameters.length == 0;
+  bool _hasCreatedConstructor(ClassMirror classToRegister) {
+    var htmlClassMirror = _getDomSuperClass(classToRegister);
 
-      // Get the created constructor source and look at the initializer;
-      // Must call super.created() if not its as an error.
-      var createdSource = methodMirror.source;
-      RegExp regExp = new RegExp(r":(.*?)(;|}|\n)");
-      var match = regExp.firstMatch(createdSource);
-      superCreatedCalled = match.input.substring(match.start,match.end).contains("super.created()");
-    }
+    var classMirror = classToRegister;
+    while (classMirror != null && classMirror != htmlClassMirror) {
+      var createdParametersValid = false;
+      var superCreatedCalled = false;
+      var className = MirrorSystem.getName(classMirror.simpleName);
+      var methodMirror = classMirror.declarations[new Symbol("$className.created")];
+      if (methodMirror != null && methodMirror.isConstructor) {
+        createdParametersValid = true;                // Assume no parameters.
+        if (methodMirror.parameters.length != 0) {
+          // If any parameters each one must be optional.
+          methodMirror.parameters.forEach((parameter) {
+            createdParametersValid = createdParametersValid && parameter.isOptional;
+          });
+        }
 
-    if (!superCreatedCalled) {
-      throw new DomException.jsInterop('created constructor initializer must call super.created()');
-    } else if (!createdParametersValid) {
-      throw new DomException.jsInterop('created constructor must have no parameters');
+        // Get the created constructor source and look at the initializer;
+        // Must call super.created() if not its as an error.
+        var createdSource = methodMirror.source.replaceAll('\n', ' ');
+        RegExp regExp = new RegExp(r":(.*?)(;|}|\n)");
+        var match = regExp.firstMatch(createdSource);
+        superCreatedCalled = match.input.substring(match.start,match.end).contains("super.created(");
+      }
+
+      if (!superCreatedCalled) {
+        throw new DomException.jsInterop('created constructor initializer must call super.created()');
+      } else if (!createdParametersValid) {
+        throw new DomException.jsInterop('created constructor must have no parameters');
+      }
+
+      classMirror = classMirror.superclass;
     }
 
     return true;
   }
 $endif
 
   @Experimental()
   /**
    * Register a custom subclass of Element to be instantiatable by the DOM.
    *
@@ skipping 176 matching lines @@
   /// parameter must be provided.
   @Experimental()
   ElementUpgrader createElementUpgrader(Type type, {String extendsTag}) {
 $if DART2JS
     return new _JSElementUpgrader(this, type, extendsTag);
 $else
     return new _VMElementUpgrader(this, type, extendsTag);
 $endif
   }
 }