rename the styleMedia methods and let them al take lists

Author: annevk

cssom-view/Overview.html

@@ -27,13 +27,13 @@
 
    <h1 id=cssom-view-module>CSSOM View Module</h1>
 
-   <h2 class="no-num no-toc" id=w3c-doctype>Editor's Draft 26 May 2010</h2>
+   <h2 class="no-num no-toc" id=w3c-doctype>Editor's Draft 15 July 2010</h2>
 
    <dl>
     <dt>This Version:
 
     <dd><a
-     href="http://www.w3.org/TR/2010/ED-cssom-view-20100526/">http://www.w3.org/TR/2010/ED-cssom-view-20100526/</a>
+     href="http://www.w3.org/TR/2010/ED-cssom-view-20100715/">http://www.w3.org/TR/2010/ED-cssom-view-20100715/</a>
 
     <dt>Latest Version:
 
@@ -300,8 +300,8 @@ <h3 id=css-pixels><span class=secno>2.3. </span>CSS pixels</h3>
    href="#ref-css21">CSS21</a></cite>]
 
   <p class=note>This does not apply to e.g. <a
-   href="#dom-stylemedia-matchmedium"><code
-   title=dom-StyleMedia-matchMedium>matchMedium()</code></a> as the units are
+   href="#dom-stylemedia-matchmedia"><code
+   title=dom-StyleMedia-matchMedia>matchMedia()</code></a> as the units are
    explicitly given there.
 
   <h2 id=dom-features><span class=secno>3. </span>DOM Features</h2>
@@ -481,10 +481,10 @@ <h3 id=the-stylemedia-interface><span class=secno>4.1. </span>The <code
 
   <pre class=idl>interface <dfn id=stylemedia>StyleMedia</dfn> {
   readonly attribute DOMString <a href="#dom-stylemedia-type" title=dom-StyleMedia-type>type</a>;
-  boolean <a href="#dom-stylemedia-matchmedium" title=dom-StyleMedia-matchMedium>matchMedium</a>(DOMString <var title="">medium</var>);
+  boolean <a href="#dom-stylemedia-matchmedia" title=dom-StyleMedia-matchMedia>matchMedia</a>(DOMString <var title="">mq_list</var>);
 
-  void <a href="#dom-StyleMedia-addMediumListener" title=dom-StyleMedia-addMediumListener>addMediumListener</a>(DOMString <var title="">medium</var>, <a href="#booleancallback">BooleanCallback</a> <var title="">mediumcallback</var>);
-  void <a href="#dom-StyleMedia-removeMediumListener" title=dom-StyleMedia-removeMediumListener>removeMediumListener</a>(DOMString <var title="">medium</var>, <a href="#booleancallback">BooleanCallback</a> <var title="">mediumcallback</var>);
+  void <a href="#dom-stylemedia-addmedialistener" title=dom-StyleMedia-addMediaListener>addMediaListener</a>(DOMString <var title="">mq_list</var>, <a href="#booleancallback">BooleanCallback</a> <var title="">mq_callback</var>);
+  void <a href="#dom-stylemedia-removemedialistener" title=dom-StyleMedia-removeMediaListener>removeMediaListener</a>(DOMString <var title="">mq_list</var>, <a href="#booleancallback">BooleanCallback</a> <var title="">mq_callback</var>);
 };
 
 [Callback=FunctionOnly, NoInterfaceObject]
@@ -507,24 +507,24 @@ <h3 id=the-stylemedia-interface><span class=secno>4.1. </span>The <code
    <pre><code>var isProjection = media.type == "projection"</code></pre>
   </div>
 
-  <p>The <dfn id=dom-stylemedia-matchmedium
-   title=dom-StyleMedia-matchMedium><code>matchMedium(<var
-   title="">medium</var>)</code></dfn> method <em class=ct>must</em> run
+  <p>The <dfn id=dom-stylemedia-matchmedia
+   title=dom-StyleMedia-matchMedia><code>matchMedia(<var
+   title="">mq_list</var>)</code></dfn> method <em class=ct>must</em> run
    these steps:
 
   <ol>
    <li>
-    <p>Let <var title="">m</var> be the result of <a
-     href="#parse-a-media-query" title="parse a media query">parsing</a> the
-     given value.
+    <p>Let <var title="">parsed_mq_list</var> be the result of <span
+     title="parse a list of media queries">parsing</span> <var
+     title="">mq_list</var>.
 
    <li>
-    <p>If <var title="">m</var> is null terminate these steps.
+    <p>If <var title="">parsed_mq_list</var> is null terminate these steps.
 
    <li>
-    <p>If <var title="">m</var> matches the state of the rendered <a
-     href="#document"><code>Document</code></a> return true and terminate
-     this algorithm.
+    <p>If <var title="">parsed_mq_list</var> matches the state of the
+     rendered <a href="#document"><code>Document</code></a> return true and
+     terminate this algorithm.
 
    <li>
     <p>Otherwise, return false.
@@ -533,80 +533,79 @@ <h3 id=the-stylemedia-interface><span class=secno>4.1. </span>The <code
   <div class=example>
    <p>The following snippet determines whether the device is a color device:</p>
 
-   <pre><code>var isColorDevice = styleMedia.matchMedium("(color)")</code></pre>
+   <pre><code>var isColorDevice = styleMedia.matchMedia("(color)")</code></pre>
   </div>
 
   <p>Each <a href="#window"><code>Window</code></a> has an associated ordered
-   <dfn id=list-of-media-query-listeners>list of media query listeners</dfn>.
-   Each listener consists of a media query and a callback.
+   <dfn id=list-of-media-listeners>list of media listeners</dfn>. Each
+   listener consists of a list of media queries and a callback.
 
   <p class=note>Due to the rules for <a
-   href="#dom-StyleMedia-addMediumListener"><code
-   title=dom-StyleMedia-addMediumListener>addMediumListener()</code></a>
-   below each listener is unique. Media queries and callbacks are not
+   href="#dom-stylemedia-addmedialistener"><code
+   title=dom-StyleMedia-addMediaListener>addMediaListener()</code></a> below
+   each listener is unique. Lists of media queries and callbacks are not
    necessarily unique.
 
-  <p>The <dfn id=dom-StyleMedia-addMediumListener
-   title=dom-StyleMedia-addMediumListener><code>addMediumListener(<var
-   title="">medium</var>, <var title="">mediumcallback</var>)</code></dfn>
+  <p>The <dfn id=dom-stylemedia-addmedialistener
+   title=dom-StyleMedia-addMediaListener><code>addMediaListener(<var
+   title="">mq_list</var>, <var title="">mq_callback</var>)</code></dfn>
    method <em class=ct>must</em> run these steps:</p>
   <!-- based on dom-MediaList-appendMedium -->
 
   <ol>
    <li>
-    <p>Let <var title="">m</var> be the result of <a
-     href="#parse-a-media-query" title="parse a media query">parsing</a> the
-     given value.
+    <p>Let <var title="">parsed_mq_list</var> be the result of <span
+     title="parse a list of media queries">parsing</span> <var
+     title="">mq_list</var>.
 
    <li>
-    <p>If <var title="">m</var> is null terminate these steps.
+    <p>If <var title="">parsed_mq_list</var> is null terminate these steps.
 
    <li>
     <p>If <a href="#compare-media-queries" title="compare media
-     queries">comparing</a> <var title="">m</var> with any of the media
-     queries in the <a href="#list-of-media-query-listeners">list of media
-     query listeners</a> returns true <em>and</em> the associated callback of
-     that media query is the same as <var title="">mediumcallback</var>,
+     queries">comparing</a> <var title="">parsed_mq_list</var> with any of
+     the list of media queries in the <a href="#list-of-media-listeners">list
+     of media listeners</a> returns true <em>and</em> the associated callback
+     of that media query is the same as <var title="">mq_callback</var>,
      terminate these steps.
 
    <li>
-    <p>Append the tuple of <var title="">m</var> and <var
-     title="">mediumcallback</var> to the <a
-     href="#list-of-media-query-listeners">list of media query listeners</a>.
+    <p>Append the tuple of <var title="">parsed_mq_list</var> and <var
+     title="">mq_callback</var> to the <a
+     href="#list-of-media-listeners">list of media listeners</a>.
   </ol>
 
-  <p>The <dfn id=dom-StyleMedia-removeMediumListener
-   title=dom-StyleMedia-removeMediumListener><code>removeMediumListener(<var
-   title="">medium</var>, <var title="">mediumcallback</var>)</code></dfn>
+  <p>The <dfn id=dom-stylemedia-removemedialistener
+   title=dom-StyleMedia-removeMediaListener><code>removeMediaListener(<var
+   title="">mq_list</var>, <var title="">mq_callback</var>)</code></dfn>
    method <em class=ct>must</em> run these steps:
 
   <ol>
    <li>
-    <p>Let <var title="">m</var> be the result of <a
-     href="#parse-a-media-query" title="parse a media query">parsing</a> the
-     given value.
+    <p>Let <var title="">parsed_mq_list</var> be the result of <span
+     title="parse a list of media queries">parsing</span> <var
+     title="">mq_list</var>.
 
    <li>
-    <p>If <var title="">m</var> is null terminate these steps.
+    <p>If <var title="">parsed_mq_list</var> is null terminate these steps.
 
    <li>
     <p>If <a href="#compare-media-queries" title="compare media
      queries">comparing</a> <var title="">m</var> with any of the media
-     queries in the <a href="#list-of-media-query-listeners">list of media
-     query listeners</a> returns true <em>and</em> the associated callback of
-     that media query is the same as <var title="">mediumcallback</var>,
-     remove the tuple of <var title="">m</var> and <var
-     title="">mediumcallback</var> from the <a
-     href="#list-of-media-query-listeners">list of media query listeners</a>.
+     queries in the <a href="#list-of-media-listeners">list of media
+     listeners</a> returns true <em>and</em> the associated callback of that
+     media query is the same as <var title="">mq_callback</var>, remove the
+     tuple of <var title="">m</var> and <var title="">mq_callback</var> from
+     the <a href="#list-of-media-listeners">list of media listeners</a>.
   </ol>
 
-  <p>If one or more media queries in the <a
-   href="#list-of-media-query-listeners">list of media query listeners</a>
-   changes in evaluation then for each media query of which the evaluation
-   changes, in the order of the <a href="#list-of-media-query-listeners">list
-   of media query listeners</a>, <a href="#queue-a-task">queue a task</a>
-   that invokes the associated callback, passing as argument whether the
-   media query matches the state of the rendered <a
+  <p>If one or more lists of media queries in the <a
+   href="#list-of-media-listeners">list of media listeners</a> changes in
+   evaluation then for each list of media queries of which the evaluation
+   changes, in the order of the <a href="#list-of-media-listeners">list of
+   media listeners</a>, <a href="#queue-a-task">queue a task</a> that invokes
+   the associated callback, passing as argument whether the list of media
+   queries matches the state of the rendered <a
    href="#document"><code>Document</code></a> at the time the <a
    href="#task">task</a> was <a href="#queue-a-task" title="queue a
    task">queued</a>.
@@ -621,18 +620,19 @@ <h3 id=the-stylemedia-interface><span class=secno>4.1. </span>The <code
   else
     &hellip;
 }
-styleMedia.addMediumListener("(orientation:landscape)", handleOrientationChange)</code></pre>
+styleMedia.addMediaListener("(orientation:landscape)", handleOrientationChange)</code></pre>
 
    <p>A more generic handler for media query changes could be written as
     follows:</p>
 
    <pre><code>function handleMediaQueryChange(query, matches) {
   &hellip;
 }
-function addMediumListener(query) {
-  styleMedia.addMediumListener(query,
+function addMediaListener(query) {
+  styleMedia.addMediaListener(
+    query,
     function(matches) { handleMediaQueryChange(query, matches) }
-  ) 
+  )
 }</code></pre>
   </div>
 
@@ -673,7 +673,9 @@ <h3 id=the-screen-interface><span class=secno>4.2. </span>The <code
   <!-- pixelDepth is not supported by Internet Explorer 7 -->
 
   <p class=note>Bits allocated to handling transparency are not taken into
-   account.
+   account.</p>
+  <!-- this note is there because it does not work reliably on Windows in
+       all browsers -->
 
   <h2 id=extensions-to-the-document-interface><span class=secno>5.
    </span>Extensions to the <code title="">Document</code> Interface</h2>