Revert "Patched in Dartium JsInterop"

tools/dom/templates/html/impl/impl_Element.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.
 
 part of $LIBRARYNAME;
 
 class _ChildrenElementList extends ListBase<Element>
     implements NodeListWrapper {
   // Raw Element.
   final Element _element;
@@ skipping 15 matching lines @@
   }
 
   Element operator [](int index) {
     return _childElements[index];
   }
 
   void operator []=(int index, Element value) {
     _element._replaceChild(value, _childElements[index]);
   }
 
-  set length(int newLength) {
+  void set length(int newLength) {
     // TODO(jacobr): remove children when length is reduced.
     throw new UnsupportedError('Cannot resize element lists');
   }
 
   Element add(Element value) {
     _element.append(value);
     return value;
   }
 
   Iterator<Element> get iterator => toList().iterator;
@@ skipping 43 matching lines @@
     throw new UnimplementedError();
   }
 
   void fillRange(int start, int end, [Element fillValue]) {
     throw new UnimplementedError();
   }
 
   bool remove(Object object) {
     if (object is Element) {
       Element element = object;
-$if JSINTEROP
-      // We aren't preserving identity of nodes in JSINTEROP mode
-      if (element.parentNode == _element) {
-$else
       if (identical(element.parentNode, _element)) {
-$endif
         _element._removeChild(element);
         return true;
       }
     }
     return false;
   }
 
   void insert(int index, Element element) {
     if (index < 0 || index > length) {
       throw new RangeError.range(index, 0, length);
@@ skipping 163 matching lines @@
 $endif
 
   int get length => _nodeList.length;
 
   Element operator [](int index) => _nodeList[index];
 
   void operator []=(int index, Element value) {
     throw new UnsupportedError('Cannot modify list');
   }
 
-  set length(int newLength) {
+  void set length(int newLength) {
     throw new UnsupportedError('Cannot modify list');
   }
 
   void sort([Comparator<Element> compare]) {
     throw new UnsupportedError('Cannot sort list');
   }
 
   void shuffle([Random random]) {
     throw new UnsupportedError('Cannot shuffle list');
   }
 
   Element get first => _nodeList.first;
 
   Element get last => _nodeList.last;
 
   Element get single => _nodeList.single;
 
   CssClassSet get classes => new _MultiElementCssClassSet(this);
 
   CssStyleDeclarationBase get style =>
       new _CssStyleDeclarationSet(this);
 
-  set classes(Iterable<String> value) {
+  void set classes(Iterable<String> value) {
     // TODO(sra): This might be faster for Sets:
     //
     //     new _MultiElementCssClassSet(this).writeClasses(value)
     //
     // as the code below converts the Iterable[value] to a string multiple
     // times.  Maybe compute the string and set className here.
     _nodeList.forEach((e) => e.classes = value);
   }
 
   CssRect get contentEdge => new _ContentCssListRect(this);
 
   CssRect get paddingEdge => this.first.paddingEdge;
 
   CssRect get borderEdge => this.first.borderEdge;
 
   CssRect get marginEdge => this.first.marginEdge;
 
   List<Node> get rawList => _nodeList;
 
 $!ELEMENT_STREAM_GETTERS
 }
 
 @DocsEditable()
-$(ANNOTATIONS)$(NATIVESPEC)class $CLASSNAME$EXTENDS$IMPLEMENTS {
+$(ANNOTATIONS)$(NATIVESPEC)abstract class $CLASSNAME$EXTENDS$IMPLEMENTS {
 
   /**
    * Creates an HTML element from a valid fragment of HTML.
    *
    *     var element = new Element.html('<div class="foo">content</div>');
    *
    * The HTML fragment should contain only one single root element, any
    * leading or trailing text nodes will be removed.
    *
    * The HTML fragment is parsed as if it occurred within the context of a
@@ skipping 26 matching lines @@
    *
    *     class CustomElement extends Element {
    *       factory CustomElement() => new Element.tag('x-custom');
    *
    *       CustomElement.created() : super.created() {
    *          // Perform any element initialization.
    *       }
    *     }
    *     document.registerElement('x-custom', CustomElement);
    */
-  Element.created() : super._created();
+  Element.created() : super._created() {
+    // Validate that this is a custom element & perform any additional
+    // initialization.
+    _initializeCustomElement(this);
+  }
 
   /**
    * Creates the HTML element specified by the tag name.
    *
    * This is similar to [Document.createElement].
    * [tag] should be a valid HTML tag name. If [tag] is an unknown tag then
    * this will create an [UnknownElement].
    *
    *     var divElement = new Element.tag('div');
    *     print(divElement is DivElement); // 'true'
@@ skipping 160 matching lines @@
    *
    * Any modifications to the attribute map will automatically be applied to
    * this element.
    *
    * This only includes attributes which are not in a namespace
    * (such as 'xlink:href'), additional attributes can be accessed via
    * [getNamespacedAttributes].
    */
   Map<String, String> get attributes => new _ElementAttributeMap(this);
 
-  set attributes(Map<String, String> value) {
+  void set attributes(Map<String, String> value) {
     Map<String, String> attributes = this.attributes;
     attributes.clear();
     for (String key in value.keys) {
       attributes[key] = value[key];
     }
   }
 
   /**
    * List of the direct children of this element.
    *
    * This collection can be used to add and remove elements from the document.
    *
    *     var item = new DivElement();
    *     item.text = 'Something';
    *     document.body.children.add(item) // Item is now displayed on the page.
    *     for (var element in document.body.children) {
    *       element.style.background = 'red'; // Turns every child of body red.
    *     }
    */
+$if DART2JS
   List<Element> get children => new _ChildrenElementList._wrap(this);
+$else
+  $if JSINTEROP
+  List<Element> get children => new FilteredElementList(this);
+  $else
+  List<Element> get children => new _ChildrenElementList._wrap(this);
+  $endif
+$endif
 
-  set children(List<Element> value) {
+  void set children(List<Element> value) {
     // Copy list first since we don't want liveness during iteration.
     List copy = new List.from(value);
     var children = this.children;
     children.clear();
     children.addAll(copy);
   }
 
   /**
    * Finds all descendent elements of this element that match the specified
    * group of selectors.
    *
    * [selectors] should be a string using CSS selector syntax.
    *
    *     var items = element.querySelectorAll('.itemClassName');
    *
    * For details about CSS selector syntax, see the
    * [CSS selector specification](http://www.w3.org/TR/css3-selectors/).
    */
   @DomName('Element.querySelectorAll')
   ElementList<Element> querySelectorAll(String selectors) =>
+$if JSINTEROP
+    _querySelectorAll(selectors);
+$else
     new _FrozenElementList._wrap(_querySelectorAll(selectors));
+$endif
 
   /**
    * Alias for [querySelector]. Note this function is deprecated because its
    * semantics will be changing in the future.
    */
   @deprecated
   @DomName('Element.querySelector')
   @Experimental()
   Element query(String relativeSelectors) => querySelector(relativeSelectors);
 
@@ skipping 12 matching lines @@
    *
    * This set makes it easy to add, remove or toggle the classes applied to
    * this element.
    *
    *     element.classes.add('selected');
    *     element.classes.toggle('isOnline');
    *     element.classes.remove('selected');
    */
   CssClassSet get classes => new _ElementCssClassSet(this);
 
-  set classes(Iterable<String> value) {
+  void set classes(Iterable<String> value) {
     // TODO(sra): Do this without reading the classes in clear() and addAll(),
     // or writing the classes in clear().
     CssClassSet classSet = classes;
     classSet.clear();
     classSet.addAll(value);
   }
 
   /**
    * Allows access to all custom data attributes (data-*) set on this element.
    *
@@ skipping 13 matching lines @@
    *
    *     var value = element.dataset['myRandomValue'];
    *
    * See also:
    *
    * * [Custom data attributes](http://www.w3.org/TR/html5/global-attributes.html#custom-data-attribute)
    */
   Map<String, String> get dataset =>
     new _DataAttributeMap(attributes);
 
-  set dataset(Map<String, String> value) {
+  void set dataset(Map<String, String> value) {
     final data = this.dataset;
     data.clear();
     for (String key in value.keys) {
       data[key] = value[key];
     }
   }
 
   /**
    * Gets a map for manipulating the attributes of a particular namespace.
    *
@@ skipping 98 matching lines @@
   /** *Deprecated*: override [attached] instead. */
   @Experimental()
   @deprecated
   void enteredView() {}
 
   /** *Deprecated*: override [detached] instead. */
   @Experimental()
   @deprecated
   void leftView() {}
 
+$if DART2JS
   /**
    * Creates a new AnimationEffect object whose target element is the object
    * on which the method is called, and calls the play() method of the
    * AnimationTimeline object of the document timeline of the node document
    * of the element, passing the newly created AnimationEffect as the argument
    * to the method. Returns an AnimationPlayer for the effect.
    *
    * Examples
    *
    *     var animation = elem.animate([{"opacity": 75}, {"opacity": 0}], 200);
    *
    *     var animation = elem.animate([
    *       {"transform": "translate(100px, -100%)"},
    *       {"transform" : "translate(400px, 500px)"}
-   *     ], 1500);
+   *     ], 1500);  
    *
    * The [frames] parameter is an Iterable<Map>, where the
    * map entries specify CSS animation effects. The
    * [timing] paramter can be a double, representing the number of milliseconds
    * for the transition, or a Map with fields corresponding to those
    * of the [Timing] object.
+   *
+   * This is not yet supported in Dartium.
   **/
+// TODO(alanknight): Correct above comment once it works in Dartium.
   @Experimental
   @SupportedBrowser(SupportedBrowser.CHROME, '36')
   AnimationPlayer animate(Iterable<Map<String, dynamic>> frames, [timing]) {
     if (frames is! Iterable || !(frames.every((x) => x is Map))) {
       throw new ArgumentError("The frames parameter should be a List of Maps "
           "with frame information");
     }
     var convertedFrames = frames;
     if (convertedFrames is Iterable) {
-      convertedFrames = convertDartToNative_List(
-          frames.map(convertDartToNative_Dictionary).toList());
+      convertedFrames = frames.map(convertDartToNative_Dictionary).toList();
     }
     var convertedTiming = timing;
     if (convertedTiming is Map) {
       convertedTiming = convertDartToNative_Dictionary(convertedTiming);
     }
     return convertedTiming == null
       ? _animate(convertedFrames)
       : _animate(convertedFrames, convertedTiming);
   }
 
-$if DART2JS
   @DomName('Element.animate')
   @JSName('animate')
   @Experimental() // untriaged
   AnimationPlayer _animate(Object effect, [timing]) native;
 $endif
   /**
    * Called by the DOM whenever an attribute on this has been changed.
    */
   void attributeChanged(String name, String oldValue, String newValue) {}
 
@@ skipping 13 matching lines @@
    *
    * If xtag has not been set, it will simply return `this` [Element].
    *
    * [wc]: http://dvcs.w3.org/hg/webcomponents/raw-file/tip/explainer/index.html
    * [x-tags]: http://x-tags.org/
    */
   // Note: return type is `dynamic` for convenience to suppress warnings when
   // members of the component are used. The actual type is a subtype of Element.
   get xtag => _xtag != null ? _xtag : this;
 
-  set xtag(Element value) {
+  void set xtag(Element value) {
     _xtag = value;
   }
 
   @DomName('Element.localName')
   @DocsEditable()
 $if DART2JS
   @Returns('String')
   // Non-null for Elements.
   String get localName => JS('String', '#', _localName);
 $else
@@ skipping 105 matching lines @@
   void insertAdjacentText(String where, String text) {
     if (JS('bool', '!!#.insertAdjacentText', this)) {
       _insertAdjacentText(where, text);
     } else {
       _insertAdjacentNode(where, new Text(text));
     }
   }
 
   @JSName('insertAdjacentText')
   void _insertAdjacentText(String where, String text) native;
-
+  
 $else
 $endif
 
   /**
    * Parses text as an HTML fragment and inserts it into the DOM at the
    * specified location.
    *
    * The [where] parameter indicates where to insert the HTML fragment:
    *
    * * 'beforeBegin': Immediately before this element.
@@ skipping 242 matching lines @@
   @Experimental()
   Point offsetTo(Element parent) {
     return Element._offsetToHelper(this, parent);
   }
 
   static Point _offsetToHelper(Element current, Element parent) {
     // We're hopping from _offsetParent_ to offsetParent (not just parent), so
     // offsetParent, "tops out" at BODY. But people could conceivably pass in
     // the document.documentElement and I want it to return an absolute offset,
     // so we have the special case checking for HTML.
-$if JSINTEROP
-    bool sameAsParent = current == parent;
-$else
-    bool sameAsParent = identical(current, parent);
-$endif
-    bool foundAsParent = sameAsParent || parent.tagName == 'HTML';
-    if (current == null || sameAsParent) {
+    bool foundAsParent = identical(current, parent) || parent.tagName == 'HTML';
+    if (current == null || identical(current, parent)) {
       if (foundAsParent) return new Point(0, 0);
       throw new ArgumentError("Specified element is not a transitive offset "
           "parent of this element.");
     }
     Element parentOffset = current.offsetParent;
     Point p = Element._offsetToHelper(parentOffset, parent);
     return new Point(p.x + current.offsetLeft, p.y + current.offsetTop);
   }
 
   static HtmlDocument _parseDocument;
@@ skipping 37 matching lines @@
       }
       treeSanitizer = _defaultSanitizer;
     } else if (validator != null) {
       throw new ArgumentError(
           'validator can only be passed if treeSanitizer is null');
     }
 
     if (_parseDocument == null) {
       _parseDocument = document.implementation.createHtmlDocument('');
       _parseRange = _parseDocument.createRange();
-
+        
       // Workaround for Safari bug. Was also previously Chrome bug 229142
-      // - URIs are not resolved in new doc.
-      var base = _parseDocument.createElement('base');
-      base.href = document.baseUri;
+      // - URIs are not resolved in new doc.    
+      var base = _parseDocument.createElement('base');  
+      base.href = document.baseUri;     
       _parseDocument.head.append(base);
     }
     var contextElement;
     if (this is BodyElement) {
       contextElement = _parseDocument.body;
     } else {
       contextElement = _parseDocument.createElement(tagName);
       _parseDocument.body.append(contextElement);
     }
     var fragment;
@@ skipping 37 matching lines @@
       'BASE', 'BASEFONT', 'BR', 'COL', 'COLGROUP', 'EMBED', 'FRAME', 'FRAMESET',
       'HR', 'IMAGE', 'IMG', 'INPUT', 'ISINDEX', 'LINK', 'META', 'PARAM',
       'SOURCE', 'STYLE', 'TITLE', 'WBR'];
 
   /**
    * Parses the HTML fragment and sets it as the contents of this element.
    *
    * This uses the default sanitization behavior to sanitize the HTML fragment,
    * use [setInnerHtml] to override the default behavior.
    */
-  set innerHtml(String html) {
+  void set innerHtml(String html) {
     this.setInnerHtml(html);
   }
 
   /**
    * Parses the HTML fragment and sets it as the contents of this element.
    * This ensures that the generated content follows the sanitization rules
    * specified by the validator or treeSanitizer.
    *
    * If the default validation behavior is too restrictive then a new
    * NodeValidator should be created, either extending or wrapping a default
@@ skipping 21 matching lines @@
           html, validator: validator, treeSanitizer: treeSanitizer));
     }
   }
   String get innerHtml => _innerHtml;
 
   /**
    * This is an ease-of-use accessor for event streams which should only be
    * used when an explicit accessor is not available.
    */
   ElementEvents get on => new ElementEvents(this);
-
+  
   /**
    * Verify if any of the attributes that we use in the sanitizer look unexpected,
    * possibly indicating DOM clobbering attacks.
    *
    * Those attributes are: attributes, lastChild, children, previousNode and tagName.
    */
 $if DART2JS
   static bool _hasCorruptedAttributes(Element element) {
      return JS('bool', r'''
        (function(element) {
          if (!(element.attributes instanceof NamedNodeMap)) {
            return true;
          }
          var childNodes = element.childNodes;
          if (element.lastChild &&
              element.lastChild !== childNodes[childNodes.length -1]) {
            return true;
          }
          if (element.children) { // On Safari, children can apparently be null.
            if (!((element.children instanceof HTMLCollection) ||
                (element.children instanceof NodeList))) {
              return true;
            }
          }
          return false;
           })(#)''', element);
   }
 $else
-
-  static var _namedNodeMap = js.context["NamedNodeMap"];
-  static var _htmlCollection = js.context["HTMLCollection"];
-  static var _nodeList = js.context["NodeList"];
-
-  static bool _hasCorruptedAttributes(Element element) {
-    var attributes = unwrap_jso(element)["attributes"];
-    if (!attributes.instanceof(_namedNodeMap)) {
-      return true;
-    }
-    var childNodes = unwrap_jso(element.childNodes);
-    var length = childNodes["length"];
-    var lastChild = unwrap_jso(element.lastChild);
-    if (null != lastChild &&
-        lastChild != childNodes[length - 1]) {
-      return true;
-    }
-    var children = unwrap_jso(element._children);
-    if (null != children) { // On Safari, children can apparently be null.
-      if (!children.instanceof(_htmlCollection) ||
-          children.instanceof(_nodeList)) {
-        return true;
-      }
-    }
-    return false;
-  }
+  // Dartium isn't affected by these attacks, because it goes directly to the C++ API.
+  static bool _hasCorruptedAttributes(Element element) => false;
 $endif
 
-  String get _safeTagName {
-    String result = 'element tag unavailable';
-    try {
-      if (tagName is String) {
-        result = tagName;
-      }
-    } catch (e) {}
-    return result;
-  }
-
 $if DART2JS
   @DomName('Element.offsetHeight')
   @DocsEditable()
   int get offsetHeight => JS('num', '#.offsetHeight', this).round();
 
   @DomName('Element.offsetLeft')
   @DocsEditable()
   int get offsetLeft => JS('num', '#.offsetLeft', this).round();
 
   @DomName('Element.offsetTop')
@@ skipping 23 matching lines @@
   @DomName('Element.scrollHeight')
   @DocsEditable()
   int get scrollHeight => JS('num', '#.scrollHeight', this).round();
 
   @DomName('Element.scrollLeft')
   @DocsEditable()
   int get scrollLeft => JS('num', '#.scrollLeft', this).round();
 
   @DomName('Element.scrollLeft')
   @DocsEditable()
-  set scrollLeft(int value) {
+  void set scrollLeft(int value) {
     JS("void", "#.scrollLeft = #", this, value.round());
   }
 
   @DomName('Element.scrollTop')
   @DocsEditable()
   int get scrollTop => JS('num', '#.scrollTop', this).round();
 
   @DomName('Element.scrollTop')
   @DocsEditable()
-  set scrollTop(int value) {
+  void set scrollTop(int value) {
     JS("void", "#.scrollTop = #", this, value.round());
   }
 
   @DomName('Element.scrollWidth')
   @DocsEditable()
   int get scrollWidth => JS('num', '#.scrollWidth', this).round();
 
 $else
   $if JSINTEROP
   @DomName('Element.offsetHeight')
@@ skipping 31 matching lines @@
   @DomName('Element.scrollHeight')
   @DocsEditable()
   int get scrollHeight => _blink.BlinkElement.instance.scrollHeight_Getter_(unwrap_jso(this)).round();
 
   @DomName('Element.scrollLeft')
   @DocsEditable()
   int get scrollLeft => _blink.BlinkElement.instance.scrollLeft_Getter_(unwrap_jso(this)).round();
 
   @DomName('Element.scrollLeft')
   @DocsEditable()
-  set scrollLeft(int value) => _blink.BlinkElement.instance.scrollLeft_Setter_(unwrap_jso(this), value.round());
+  void set scrollLeft(int value) => _blink.BlinkElement.instance.scrollLeft_Setter_(unwrap_jso(this), value.round());
 
   @DomName('Element.scrollTop')
   @DocsEditable()
   int get scrollTop => _blink.BlinkElement.instance.scrollTop_Getter_(unwrap_jso(this)).round();
 
   @DomName('Element.scrollTop')
   @DocsEditable()
-  set scrollTop(int value) => _blink.BlinkElement.instance.scrollTop_Setter_(unwrap_jso(this), value.round());
+  void set scrollTop(int value) => _blink.BlinkElement.instance.scrollTop_Setter_(unwrap_jso(this), value.round());
 
   @DomName('Element.scrollWidth')
   @DocsEditable()
   int get scrollWidth => _blink.BlinkElement.instance.scrollWidth_Getter_(unwrap_jso(this)).round();
   $else
   @DomName('Element.offsetHeight')
   @DocsEditable()
   int get offsetHeight => _blink.BlinkElement.offsetHeight_Getter(this).round();
 
   @DomName('Element.offsetLeft')
@@ skipping 27 matching lines @@
   @DomName('Element.scrollHeight')
   @DocsEditable()
   int get scrollHeight => _blink.BlinkElement.scrollHeight_Getter(this).round();
 
   @DomName('Element.scrollLeft')
   @DocsEditable()
   int get scrollLeft => _blink.BlinkElement.scrollLeft_Getter(this).round();
 
   @DomName('Element.scrollLeft')
   @DocsEditable()
-  set scrollLeft(int value) => _blink.BlinkElement.scrollLeft_Setter(this, value.round());
+  void set scrollLeft(int value) => _blink.BlinkElement.scrollLeft_Setter(this, value.round());
 
   @DomName('Element.scrollTop')
   @DocsEditable()
   int get scrollTop => _blink.BlinkElement.scrollTop_Getter(this).round();
 
   @DomName('Element.scrollTop')
   @DocsEditable()
-  set scrollTop(int value) => _blink.BlinkElement.scrollTop_Setter(this, value.round());
+  void set scrollTop(int value) => _blink.BlinkElement.scrollTop_Setter(this, value.round());
 
   @DomName('Element.scrollWidth')
   @DocsEditable()
   int get scrollWidth => _blink.BlinkElement.scrollWidth_Getter(this).round();
   $endif
 $endif
 
 $!MEMBERS
 }
 
@@ skipping 32 matching lines @@
   const ScrollAlignment._internal(this._value);
   toString() => 'ScrollAlignment.$_value';
 
   /// Attempt to align the element to the top of the scrollable area.
   static const TOP = const ScrollAlignment._internal('TOP');
   /// Attempt to center the element in the scrollable area.
   static const CENTER = const ScrollAlignment._internal('CENTER');
   /// Attempt to align the element to the bottom of the scrollable area.
   static const BOTTOM = const ScrollAlignment._internal('BOTTOM');
 }