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

tools/dom/templates/html/impl/impl_Element.darttemplate

Index: tools/dom/templates/html/impl/impl_Element.darttemplate
diff --git a/tools/dom/templates/html/impl/impl_Element.darttemplate b/tools/dom/templates/html/impl/impl_Element.darttemplate
index 98b321d7b4471cd2f703021849db088ca546575f..1cf653d6ab773ca01e71db2ed3533f7863efcead 100644
--- a/tools/dom/templates/html/impl/impl_Element.darttemplate
+++ b/tools/dom/templates/html/impl/impl_Element.darttemplate
@@ -578,11 +578,31 @@ $(ANNOTATIONS)abstract class $CLASSNAME$EXTENDS$IMPLEMENTS$NATIVESPEC {
    *
    * [selectors] should be a string using CSS selector syntax.
    *
-   *     var items = element.query('.itemClassName');
+   *     var items = element.querySelectorAll('.itemClassName');
    */
-  ElementList queryAll(String selectors) =>
+  @DomName('Element.querySelectorAll')
+  ElementList querySelectorAll(String selectors) =>
     new _FrozenElementList._wrap(_querySelectorAll(selectors));
 
+  /** 
+   * 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);
+
+  /** 
+   * Alias for [querySelectorAll]. Note this function is deprecated because its
+   * semantics will be changing in the future.
+   */
+  @deprecated
+  @DomName('Element.querySelectorAll')
+  @Experimental()
+  ElementList queryAll(String relativeSelectors) =>
+      querySelectorAll(relativeSelectors);
+
   /**
    * The set of CSS classes applied to this element.
    *