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

tools/dom/templates/html/dart2js/html_dart2js.darttemplate

Index: tools/dom/templates/html/dart2js/html_dart2js.darttemplate
diff --git a/tools/dom/templates/html/dart2js/html_dart2js.darttemplate b/tools/dom/templates/html/dart2js/html_dart2js.darttemplate
index c2868a9504b613f349195ac2d39f5215f2a47752..b41b0b0ace9ef4f771f3de26803ddb6b77177788 100644
--- a/tools/dom/templates/html/dart2js/html_dart2js.darttemplate
+++ b/tools/dom/templates/html/dart2js/html_dart2js.darttemplate
@@ -114,8 +114,22 @@ Window get window => JS('Window', 'window');
  */
 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.