Deprecate query and queryAll, also add back querySelector and querySelectorAll.

tools/dom/templates/html/dart2js/html_dart2js.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 - unless you are editing documentation as per:
 // https://code.google.com/p/dart/wiki/ContributingHTMLDocumentation
 // Auto-generated dart:html library.
 
 /**
  * HTML elements and other resources for web-based applications that need to
@@ skipping 96 matching lines @@
  *
  *   * [Window](https://developer.mozilla.org/en-US/docs/Web/API/window) from MDN.
  */
 Window get window => JS('Window', 'window');
 
 /**
  * Root node for all content in a web page.
  */
 HtmlDocument get document => JS('HtmlDocument', 'document');
 
-Element query(String selector) => document.query(selector);
-ElementList queryAll(String selector) => document.queryAll(selector);
+/** 
+ * Alias for [querySelector]. Note this function is deprecated because its
+ * semantics will be changing in the future.
+ */
+@deprecated
+@Experimental()
+Element query(String relativeSelector) => document.query(relativeSelector);
+/** 
+ * Alias for [querySelectorAll]. Note this function is deprecated because its
+ * semantics will be changing in the future.
+ */
+@deprecated
+@Experimental()
+ElementList queryAll(String relativeSelector) => document.queryAll(relativeSelector);
+Element querySelector(String selector) => document.querySelector(selector);
+ElementList querySelectorAll(String selector) => document.querySelectorAll(selector);
 
 // Workaround for tags like <cite> that lack their own Element subclass --
 // Dart issue 1990.
 class HtmlElement extends Element native "HTMLElement" {
   factory HtmlElement() { throw new UnsupportedError("Not supported"); }
 
   /**
    * Constructor instantiated by the DOM when a custom element has been created.
    *
    * This can only be called by subclasses from their created constructor.
@@ skipping 11 matching lines @@
   if (JS('bool', r'!window.$dart$isolate$counter')) {
     JS('void', r'window.$dart$isolate$counter = 1');
   }
   return JS('int', r'window.$dart$isolate$counter++');
 }
 
 // Fast path to invoke JS send port.
 _callPortSync(int id, message) {
   return JS('var', r'ReceivePortSync.dispatchCall(#, #)', id, message);
 }