[cssom-view] Make scroll/scrollTo/scrollBy take the dictionary as first argument.

Author: Simon Pieters

cssom-view/Overview.html

@@ -527,6 +527,16 @@ <h2 id="extensions-to-the-window-interface"><span class="secno">5 </span>Extensi
 dictionary <dfn id="scrolloptions">ScrollOptions</dfn> {
   <a href="#scrollbehavior">ScrollBehavior</a> behavior = "auto";
 };
+dictionary <dfn id="scrolltooptions">ScrollToOptions</dfn> : <a href="#scrolloptions">ScrollOptions</a> {
+  double left;
+  double top;<!--
+  double right;
+  double bottom;
+  double blockStart;
+  double blockEnd;
+  double inlineStart;
+  double inlineEnd;-->
+};
 
 partial interface <a class="external" data-anolis-spec="html" href="https://html.spec.whatwg.org/multipage/browsers.html#window">Window</a> {
   <a href="#mediaquerylist">MediaQueryList</a> <a href="#dom-window-matchmedia" title="dom-Window-matchMedia">matchMedia</a>(DOMString query);
@@ -547,9 +557,12 @@ <h2 id="extensions-to-the-window-interface"><span class="secno">5 </span>Extensi
   readonly attribute double <a href="#dom-window-pagexoffset" title="dom-Window-pageXOffset">pageXOffset</a>;
   readonly attribute double <a href="#dom-window-scrolly" title="dom-Window-scrollY">scrollY</a>;
   readonly attribute double <a href="#dom-window-pageyoffset" title="dom-Window-pageYOffset">pageYOffset</a>;
-  void <a href="#dom-window-scroll" title="dom-Window-scroll">scroll</a>(unrestricted double x, unrestricted double y, optional <a href="#scrolloptions">ScrollOptions</a> options);
-  void <a href="#dom-window-scrollto" title="dom-Window-scrollTo">scrollTo</a>(unrestricted double x, unrestricted double y, optional <a href="#scrolloptions">ScrollOptions</a> options);
-  void <a href="#dom-window-scrollby" title="dom-Window-scrollBy">scrollBy</a>(unrestricted double x, unrestricted double y, optional <a href="#scrolloptions">ScrollOptions</a> options);
+  void <a href="#dom-window-scroll" title="dom-Window-scroll">scroll</a>(optional <a href="#scrolltooptions">ScrollToOptions</a> options);
+  void <a href="#dom-window-scroll" title="dom-Window-scroll">scroll</a>(unrestricted double x, unrestricted double y);
+  void <a href="#dom-window-scrollto" title="dom-Window-scrollTo">scrollTo</a>(optional <a href="#scrolltooptions">ScrollToOptions</a> options);
+  void <a href="#dom-window-scrollto" title="dom-Window-scrollTo">scrollTo</a>(unrestricted double x, unrestricted double y);
+  void <a href="#dom-window-scrollby" title="dom-Window-scrollBy">scrollBy</a>(optional <a href="#scrolltooptions">ScrollToOptions</a> options);
+  void <a href="#dom-window-scrollby" title="dom-Window-scrollBy">scrollBy</a>(unrestricted double x, unrestricted double y);
 
   // client
   readonly attribute double <a href="#dom-window-screenx" title="dom-Window-screenX">screenX</a>;
@@ -671,10 +684,21 @@ <h2 id="extensions-to-the-window-interface"><span class="secno">5 </span>Extensi
 <p>The <dfn id="dom-window-pageyoffset" title="dom-Window-pageYOffset"><code>pageYOffset</code></dfn> attribute must return the value returned by the
 <code title="dom-Window-scrollY"><a href="#dom-window-scrolly">scrollY</a></code> attribute.</p>
 
-<p>When the <dfn id="dom-window-scroll" title="dom-Window-scroll"><code>scroll(<var>x</var>, <var>y</var>, <var>options</var>)</code></dfn> method is invoked these
+<p>When the <dfn id="dom-window-scroll" title="dom-Window-scroll"><code>scroll()</code></dfn> method is invoked these
 steps must be run:</p>
 <ol>
- <li><p><a href="#normalize-non-finite-values">Normalize non-finite values</a> for <var>x</var> and <var>y</var>.
+ <li><p>If invoked with one argument, follow these substeps:
+  <ol>
+   <li><p>Let <var>options</var> be the argument.
+   <li><p>Let <var>x</var> be the value of the <code title="">left</code> dictionary member of <var>options</var>, if present, or the <a href="#viewport">viewport</a>'s current scroll position on the x axis otherwise.
+   <li><p>Let <var>y</var> be the value of the <code title="">top</code> dictionary member of <var>options</var>, if present, or the <a href="#viewport">viewport</a>'s current scroll position on the y axis otherwise.
+  </ol>
+ <li><p>If invoked with two arguments, follow these substeps:
+  <ol>
+   <li><p>Let <var>options</var> be null <a href="#converted-to-an-idl-value" title="converted to an IDL value">converted</a> to a <code><a href="#scrolltooptions">ScrollToOptions</a></code> dictionary. <a href="#refsWEBIDL">[WEBIDL]</a>
+   <li><p>Let <var>x</var> and <var>y</var> be the arguments, respectively.
+   <li><p><a href="#normalize-non-finite-values">Normalize non-finite values</a> for <var>x</var> and <var>y</var>.
+  </ol>
  <li><p>If there is no <a href="#viewport">viewport</a>, abort these steps.
  <li><p>Let <var>viewport width</var> be the width of the <a href="#viewport">viewport</a> excluding the width of the scroll bar, if any.
  <li><p>Let <var>viewport height</var> be the height of the <a href="#viewport">viewport</a> excluding the height of the scroll bar, if any.
@@ -713,10 +737,10 @@ <h2 id="extensions-to-the-window-interface"><span class="secno">5 </span>Extensi
  value of the <code title="">behavior</code> dictionary member of <var>options</var>.
 </ol>
 
-<p>When the <dfn id="dom-window-scrollto" title="dom-Window-scrollTo"><code>scrollTo(<var>x</var>, <var>y</var>, <var>options</var>)</code></dfn> method is invoked, the
+<p>When the <dfn id="dom-window-scrollto" title="dom-Window-scrollTo"><code>scrollTo()</code></dfn> method is invoked, the
 user agent must act as if the <code title="dom-Window-scroll"><a href="#dom-window-scroll">scroll()</a></code> method was invoked with the same arguments.</p>
 
-<p>When the <dfn id="dom-window-scrollby" title="dom-Window-scrollBy"><code>scrollBy(<var>x</var>, <var>y</var>, <var>options</var>)</code></dfn> method is invoked, the
+<p>When the <dfn id="dom-window-scrollby" title="dom-Window-scrollBy"><code>scrollBy()</code></dfn> method is invoked, the
 user agent must act as if the <code title="dom-Window-scroll"><a href="#dom-window-scroll">scroll()</a></code> method was invoked with
 <var>x</var> plus <code title="dom-Window-scrollX"><a href="#dom-window-scrollx">scrollX</a></code>
 as first argument and <var>y</var> plus

cssom-view/Overview.src.html

@@ -483,6 +483,16 @@ <h2>Extensions to the <code title>Window</code> Interface</h2>
 dictionary <dfn>ScrollOptions</dfn> {
   <span>ScrollBehavior</span> behavior = "auto";
 };
+dictionary <dfn>ScrollToOptions</dfn> : <span>ScrollOptions</span> {
+  double left;
+  double top;<!--
+  double right;
+  double bottom;
+  double blockStart;
+  double blockEnd;
+  double inlineStart;
+  double inlineEnd;-->
+};
 
 partial interface <span data-anolis-spec=html>Window</span> {
   <span>MediaQueryList</span> <span title=dom-Window-matchMedia>matchMedia</span>(DOMString query);
@@ -503,9 +513,12 @@ <h2>Extensions to the <code title>Window</code> Interface</h2>
   readonly attribute double <span title=dom-Window-pageXOffset>pageXOffset</span>;
   readonly attribute double <span title=dom-Window-scrollY>scrollY</span>;
   readonly attribute double <span title=dom-Window-pageYOffset>pageYOffset</span>;
-  void <span title=dom-Window-scroll>scroll</span>(unrestricted double x, unrestricted double y, optional <span>ScrollOptions</span> options);
-  void <span title=dom-Window-scrollTo>scrollTo</span>(unrestricted double x, unrestricted double y, optional <span>ScrollOptions</span> options);
-  void <span title=dom-Window-scrollBy>scrollBy</span>(unrestricted double x, unrestricted double y, optional <span>ScrollOptions</span> options);
+  void <span title=dom-Window-scroll>scroll</span>(optional <span>ScrollToOptions</span> options);
+  void <span title=dom-Window-scroll>scroll</span>(unrestricted double x, unrestricted double y);
+  void <span title=dom-Window-scrollTo>scrollTo</span>(optional <span>ScrollToOptions</span> options);
+  void <span title=dom-Window-scrollTo>scrollTo</span>(unrestricted double x, unrestricted double y);
+  void <span title=dom-Window-scrollBy>scrollBy</span>(optional <span>ScrollToOptions</span> options);
+  void <span title=dom-Window-scrollBy>scrollBy</span>(unrestricted double x, unrestricted double y);
 
   // client
   readonly attribute double <span title=dom-Window-screenX>screenX</span>;
@@ -627,10 +640,21 @@ <h2>Extensions to the <code title>Window</code> Interface</h2>
 <p>The <dfn title=dom-Window-pageYOffset><code>pageYOffset</code></dfn> attribute must return the value returned by the
 <code title=dom-Window-scrollY>scrollY</code> attribute.</p>
 
-<p>When the <dfn title=dom-Window-scroll><code>scroll(<var>x</var>, <var>y</var>, <var>options</var>)</code></dfn> method is invoked these
+<p>When the <dfn title=dom-Window-scroll><code>scroll()</code></dfn> method is invoked these
 steps must be run:</p>
 <ol>
- <li><p><span>Normalize non-finite values</span> for <var>x</var> and <var>y</var>.
+ <li><p>If invoked with one argument, follow these substeps:
+  <ol>
+   <li><p>Let <var>options</var> be the argument.
+   <li><p>Let <var>x</var> be the value of the <code title>left</code> dictionary member of <var>options</var>, if present, or the <span>viewport</span>'s current scroll position on the x axis otherwise.
+   <li><p>Let <var>y</var> be the value of the <code title>top</code> dictionary member of <var>options</var>, if present, or the <span>viewport</span>'s current scroll position on the y axis otherwise.
+  </ol>
+ <li><p>If invoked with two arguments, follow these substeps:
+  <ol>
+   <li><p>Let <var>options</var> be null <span title="converted to an IDL value">converted</span> to a <code>ScrollToOptions</code> dictionary. <span data-anolis-ref>WEBIDL</span>
+   <li><p>Let <var>x</var> and <var>y</var> be the arguments, respectively.
+   <li><p><span>Normalize non-finite values</span> for <var>x</var> and <var>y</var>.
+  </ol>
  <li><p>If there is no <span>viewport</span>, abort these steps.
  <li><p>Let <var>viewport width</var> be the width of the <span>viewport</span> excluding the width of the scroll bar, if any.
  <li><p>Let <var>viewport height</var> be the height of the <span>viewport</span> excluding the height of the scroll bar, if any.
@@ -669,10 +693,10 @@ <h2>Extensions to the <code title>Window</code> Interface</h2>
  value of the <code title>behavior</code> dictionary member of <var>options</var>.
 </ol>
 
-<p>When the <dfn title=dom-Window-scrollTo><code>scrollTo(<var>x</var>, <var>y</var>, <var>options</var>)</code></dfn> method is invoked, the
+<p>When the <dfn title=dom-Window-scrollTo><code>scrollTo()</code></dfn> method is invoked, the
 user agent must act as if the <code title=dom-Window-scroll>scroll()</code> method was invoked with the same arguments.</p>
 
-<p>When the <dfn title=dom-Window-scrollBy><code>scrollBy(<var>x</var>, <var>y</var>, <var>options</var>)</code></dfn> method is invoked, the
+<p>When the <dfn title=dom-Window-scrollBy><code>scrollBy()</code></dfn> method is invoked, the
 user agent must act as if the <code title=dom-Window-scroll>scroll()</code> method was invoked with
 <var>x</var> plus <code title='dom-Window-scrollX'>scrollX</code>
 as first argument and <var>y</var> plus