Cleanup NodeSelectors.

lib/html/frog/html_frog.dart

Index: lib/html/frog/html_frog.dart
diff --git a/lib/html/frog/html_frog.dart b/lib/html/frog/html_frog.dart
index 41ba9699b1f7bbc43a389e5f55d801a632654956..08acec7560e78e8841dba5b7c0c462f0d22a01ff 100644
--- a/lib/html/frog/html_frog.dart
+++ b/lib/html/frog/html_frog.dart
@@ -4716,10 +4716,9 @@ class _DivElementImpl extends _ElementImpl implements DivElement native "*HTMLDi
 // 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.
 
-class _DocumentImpl extends _NodeImpl
-    implements Document
+class _DocumentImpl extends _NodeImpl implements Document
     native "*HTMLDocument"
-    {
+{
 
 
   _DocumentEventsImpl get on() =>
@@ -4813,6 +4812,8 @@ class _DocumentImpl extends _NodeImpl
 
   String queryCommandValue(String command) native;
 
+  _ElementImpl $dom_querySelector(String selectors) native "querySelector";
+
   _NodeListImpl $dom_querySelectorAll(String selectors) native "querySelectorAll";
 
   void webkitCancelFullScreen() native;
@@ -4832,9 +4833,6 @@ class _DocumentImpl extends _NodeImpl
     return $dom_querySelector(selectors);
   }
 
-// TODO(jacobr): autogenerate this method.
-  _ElementImpl $dom_querySelector(String selectors) native "return this.querySelector(selectors);";
-
   ElementList queryAll(String selectors) {
     if (const RegExp("""^\\[name=["'][^'"]+['"]\\]\$""").hasMatch(selectors)) {
       final mutableMatches = $dom_getElementsByName(
@@ -5103,6 +5101,8 @@ class _DocumentFragmentImpl extends _NodeImpl implements DocumentFragment native
     elements.addAll(copy);
   }
 
+  _ElementImpl query(String selectors) => $dom_querySelector(selectors);
+
   ElementList queryAll(String selectors) =>
     new _FrozenElementList._wrap($dom_querySelectorAll(selectors));
 
@@ -5302,7 +5302,7 @@ class _DocumentFragmentImpl extends _NodeImpl implements DocumentFragment native
   _ElementEventsImpl get on() =>
     new _ElementEventsImpl(this);
 
-  _ElementImpl query(String selectors) native "querySelector";
+  _ElementImpl $dom_querySelector(String selectors) native "querySelector";
 
   _NodeListImpl $dom_querySelectorAll(String selectors) native "querySelectorAll";
 
@@ -6025,6 +6025,8 @@ class _ElementImpl extends _NodeImpl implements Element native "*Element" {
 
   ElementList get elements() => new _ChildrenElementList._wrap(this);
 
+  _ElementImpl query(String selectors) => $dom_querySelector(selectors);
+
   ElementList queryAll(String selectors) =>
     new _FrozenElementList._wrap($dom_querySelectorAll(selectors));
 
@@ -6175,7 +6177,7 @@ class _ElementImpl extends _NodeImpl implements Element native "*Element" {
 
   void insertAdjacentText(String where, String text) native;
 
-  _ElementImpl query(String selectors) native "querySelector";
+  _ElementImpl $dom_querySelector(String selectors) native "querySelector";
 
   _NodeListImpl $dom_querySelectorAll(String selectors) native "querySelectorAll";
 
@@ -9652,13 +9654,6 @@ class _NodeListImpl implements NodeList native "*NodeList" {
 
 }
 
-class _NodeSelectorImpl implements NodeSelector native "*NodeSelector" {
-
-  _ElementImpl query(String selectors) native "querySelector";
-
-  _NodeListImpl $dom_querySelectorAll(String selectors) native "querySelectorAll";
-}
-
 class _NotationImpl extends _NodeImpl implements Notation native "*Notation" {
 
   final String publicId;
@@ -22404,7 +22399,7 @@ interface Document extends HtmlElement {
   String queryCommandValue(String command);
 
   /** @domName Document.querySelector */
-  Element query(String selectors);
+  Element $dom_querySelector(String selectors);
 
   /** @domName Document.querySelectorAll */
   NodeList $dom_querySelectorAll(String selectors);
@@ -22542,7 +22537,7 @@ interface DocumentFragment extends Element default _DocumentFragmentFactoryProvi
   ElementEvents get on();
 
   /** @domName DocumentFragment.querySelector */
-  Element query(String selectors);
+  Element $dom_querySelector(String selectors);
 
   /** @domName DocumentFragment.querySelectorAll */
   NodeList $dom_querySelectorAll(String selectors);
@@ -22654,10 +22649,19 @@ interface ElementRect {
   List<ClientRect> get clientRects();
 }
 
+interface NodeSelector {
+  /** @domName Element.querySelector */
+  Element query(String selectors);
+
+  /**
+   * @domName querySelectorAll, getElementsByClassName, getElementsByTagName,
+   *   getElementsByTagNameNS
+   */
+  ElementList queryAll(String selectors);
+}
+
 /// @domName Element
 interface Element extends Node, NodeSelector default _ElementFactoryProvider {
-// TODO(jacobr): switch back to:
-// interface Element extends Node, NodeSelector, ElementTraversal default _ElementImpl {
   Element.html(String html);
   Element.tag(String tag);
 
@@ -22665,12 +22669,6 @@ interface Element extends Node, NodeSelector default _ElementFactoryProvider {
   void set attributes(Map<String, String> value);
 
   /**
-   * @domName querySelectorAll, getElementsByClassName, getElementsByTagName,
-   *   getElementsByTagNameNS
-   */
-  ElementList queryAll(String selectors);
-
-  /**
    * @domName childElementCount, firstElementChild, lastElementChild,
    *   children, Node.nodes.add
    */
@@ -22862,7 +22860,7 @@ interface Element extends Node, NodeSelector default _ElementFactoryProvider {
   void insertAdjacentText(String where, String text);
 
   /** @domName Element.querySelector */
-  Element query(String selectors);
+  Element $dom_querySelector(String selectors);
 
   /** @domName Element.querySelectorAll */
   NodeList $dom_querySelectorAll(String selectors);
@@ -26734,26 +26732,6 @@ interface NodeList extends List<Node> {
   final int length;
 
 }
-// Copyright (c) 2011, 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.
-
-/// @domName NodeSelector
-interface NodeSelector {
-
-  // TODO(nweiz): add this back once DocumentFragment is ported.
-  // ElementList queryAll(String selectors);
-
-
-  /** @domName NodeSelector.querySelector */
-  Element query(String selectors);
-
-  /** @domName NodeSelector.querySelectorAll */
-  NodeList $dom_querySelectorAll(String selectors);
-
-}
 // 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.