sdk/lib/html/dartium/html_dartium.dart

Index: sdk/lib/html/dartium/html_dartium.dart
diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart
index c8a3e5658d41e65f44a6afb3c54d74434bec68a8..5423a73c15829d6d38a2449ff3179c98d2e48d46 100644
--- a/sdk/lib/html/dartium/html_dartium.dart
+++ b/sdk/lib/html/dartium/html_dartium.dart
@@ -14766,6 +14766,32 @@ class HtmlDocument extends Document {
    * This custom element can also be instantiated via HTML using the syntax
    * `<input is="x-bar"></input>`
    *
+   * The [nativeTagName] parameter is needed by platforms without native support
+   * when subclassing a native type other than:
+   *
+   * * HtmlElement
+   * * SvgElement
+   * * AnchorElement
+   * * AudioElement
+   * * ButtonElement
+   * * CanvasElement
+   * * DivElement
+   * * ImageElement
+   * * InputElement
+   * * LIElement
+   * * LabelElement
+   * * MenuElement
+   * * MeterElement
+   * * OListElement
+   * * OptionElement
+   * * OutputElement
+   * * ParagraphElement
+   * * PreElement
+   * * ProgressElement
+   * * SelectElement
+   * * SpanElement
+   * * UListElement
+   * * VideoElement
    */
   void register(String tag, Type customElementClass, {String extendsTag}) {
     _Utils.register(this, tag, customElementClass, extendsTag);
@@ -14796,28 +14822,6 @@ class HtmlDocument extends Document {
   @Experimental()
   Stream<Event> get onVisibilityChange =>
       visibilityChangeEvent.forTarget(this);
-
-  /// Creates an element upgrader which can be used to change the Dart wrapper
-  /// type for elements.
-  ///
-  /// The type specified must be a subclass of HtmlElement, when an element is
-  /// upgraded then the created constructor will be invoked on that element.
-  ///
-  /// If the type is not a direct subclass of HtmlElement then the extendsTag
-  /// parameter must be provided.
-  @Experimental()
-  ElementUpgrader createElementUpgrader(Type type, {String extendsTag}) {
-    return new _VMElementUpgrader(this, type, extendsTag);
-  }
-}
-
-/// A utility for changing the Dart wrapper type for elements.
-abstract class ElementUpgrader {
-  /// Upgrade the specified element to be of the Dart type this was created for.
-  ///
-  /// After upgrading the element passed in is invalid and the returned value
-  /// should be used instead.
-  Element upgrade(Element element);
 }
 // 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
@@ -37958,94 +37962,6 @@ class _VariableSizeListIterator<T> implements Iterator<T> {
 
   T get current => _current;
 }
-// Copyright (c) 2014, 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.
-
-
-/// Dartium ElementUpgrader implementation.
-class _VMElementUpgrader implements ElementUpgrader {
-  final Type _type;
-  final Type _nativeType;
-
-  _VMElementUpgrader(Document document, Type type, String extendsTag) :
-      _type = type,
-      _nativeType = _validateCustomType(type).reflectedType {
-
-    if (extendsTag == null) {
-      if (_nativeType != HtmlElement) {
-        throw new UnsupportedError('Class must provide extendsTag if base '
-              'native class is not HtmlElement');
-      }
-    } else {
-      if (document.createElement(extendsTag).runtimeType != _nativeType) {
-        throw new UnsupportedError(
-            'extendsTag does not match base native class');
-      }
-    }
-  }
-
-  Element upgrade(Element element) {
-    if (element.runtimeType != _nativeType) {
-      throw new UnsupportedError('Element is incorrect type');
-    }
-    return _Utils.changeElementWrapper(element, _type);
-    return null;
-  }
-}
-
-/// Validates that the custom type is properly formed-
-///
-/// * Is a user-defined class.
-/// * Has a created constructor with zero args.
-/// * Derives from an Element subclass.
-///
-/// Then returns the native base class.
-ClassMirror _validateCustomType(Type type) {
-  ClassMirror cls = reflectClass(type);
-  if (_isBuiltinType(cls)) {
-    throw new UnsupportedError('Invalid custom element from '
-        '${(cls.owner as LibraryMirror).uri}.');
-  }
-
-  var className = MirrorSystem.getName(cls.simpleName);
-  var createdConstructor = cls.declarations[new Symbol('$className.created')];
-  if (createdConstructor == null ||
-      createdConstructor is! MethodMirror ||
-      !createdConstructor.isConstructor) {
-    throw new UnsupportedError(
-        'Class is missing constructor $className.created');
-  }
-
-  if (createdConstructor.parameters.length > 0) {
-    throw new UnsupportedError(
-        'Constructor $className.created must take zero arguments');
-  }
-
-  Symbol objectName = reflectClass(Object).qualifiedName;
-  bool isRoot(ClassMirror cls) =>
-      cls == null || cls.qualifiedName == objectName;
-  Symbol elementName = reflectClass(HtmlElement).qualifiedName;
-  bool isElement(ClassMirror cls) =>
-      cls != null && cls.qualifiedName == elementName;
-  ClassMirror superClass = cls.superclass;
-  ClassMirror nativeClass = _isBuiltinType(superClass) ? superClass : null;
-  while(!isRoot(superClass) && !isElement(superClass)) {
-    superClass = superClass.superclass;
-    if (nativeClass == null && _isBuiltinType(superClass)) {
-      nativeClass = superClass;
-    }
-  }
-  return nativeClass;
-}
-
-
-bool _isBuiltinType(ClassMirror cls) {
-  // TODO(vsm): Find a less hackish way to do this.
-  LibraryMirror lib = cls.owner;
-  String libName = lib.uri.toString();
-  return libName.startsWith('dart:');
-}
 /**
  * A custom KeyboardEvent that attempts to eliminate cross-browser
  * inconsistencies, and also provide both keyCode and charCode information
@@ -38689,10 +38605,48 @@ class _Utils {
 
   static bool isNoSuchMethodError(obj) => obj is NoSuchMethodError;
 
+  static bool _isBuiltinType(ClassMirror cls) {
+    // TODO(vsm): Find a less hackish way to do this.
+    LibraryMirror lib = cls.owner;
+    String libName = lib.uri.toString();
+    return libName.startsWith('dart:');
+  }
+
   static void register(Document document, String tag, Type type,
       String extendsTagName) {
-    var nativeClass = _validateCustomType(type);
-
+    // TODO(vsm): Move these checks into native code.
+    ClassMirror cls = reflectClass(type);
+    if (_isBuiltinType(cls)) {
+      throw new UnsupportedError("Invalid custom element from ${(cls.owner as LibraryMirror).uri}.");
+    }
+    var className = MirrorSystem.getName(cls.simpleName);
+    var createdConstructor = cls.declarations[new Symbol('$className.created')];
+    if (createdConstructor == null ||
+        createdConstructor is! MethodMirror ||
+        !createdConstructor.isConstructor) {
+      throw new UnsupportedError(
+          'Class is missing constructor $className.created');
+    }
+
+    if (createdConstructor.parameters.length > 0) {
+      throw new UnsupportedError(
+          'Constructor $className.created must take zero arguments');
+    }
+
+    Symbol objectName = reflectClass(Object).qualifiedName;
+    bool isRoot(ClassMirror cls) =>
+        cls == null || cls.qualifiedName == objectName;
+    Symbol elementName = reflectClass(HtmlElement).qualifiedName;
+    bool isElement(ClassMirror cls) =>
+        cls != null && cls.qualifiedName == elementName;
+    ClassMirror superClass = cls.superclass;
+    ClassMirror nativeClass = _isBuiltinType(superClass) ? superClass : null;
+    while(!isRoot(superClass) && !isElement(superClass)) {
+      superClass = superClass.superclass;
+      if (nativeClass == null && _isBuiltinType(superClass)) {
+        nativeClass = superClass;
+      }
+    }
     if (extendsTagName == null) {
       if (nativeClass.reflectedType != HtmlElement) {
         throw new UnsupportedError('Class must provide extendsTag if base '
@@ -38709,8 +38663,6 @@ class _Utils {
   static Element createElement(Document document, String tagName) native "Utils_createElement";
 
   static void initializeCustomElement(HtmlElement element) native "Utils_initializeCustomElement";
-
-  static void changeElementWrapper(HtmlElement element, Type type) native "Utils_changeElementWrapper";
 }
 
 class _DOMWindowCrossFrame extends NativeFieldWrapperClass2 implements