[cssom-view] Make devicePixelRatio take page zoom into account but ignore pinch zoom. https://www.w3.org/Bugs/Public/show_bug.cgi?id=23228

Author: Simon Pieters

cssom-view/Overview.html

@@ -16,7 +16,7 @@
 
  <h1>CSSOM View Module</h1>
 
- <h2 class="no-num no-toc" id="w3c-doctype">Editor's Draft 9 October 2013</h2>
+ <h2 class="no-num no-toc" id="w3c-doctype">Editor's Draft 17 October 2013</h2>
 
  <dl>
 
@@ -83,7 +83,7 @@ <h2 class="no-num no-toc" id="sotd">Status of This Document</h2>
 can be found in the <a href="http://www.w3.org/TR/">W3C technical reports
 index at http://www.w3.org/TR/.</a></em>
 
-<p>This is the 9 October 2013 Editor's Draft of CSSOM View. Please send
+<p>This is the 17 October 2013 Editor's Draft of CSSOM View. Please send
 comments to
 <a href="mailto:www-style@w3.org?subject=%5Bcssom-view%5D%20">www-style@w3.org</a>
 (<a href="http://lists.w3.org/Archives/Public/www-style/">archived</a>)
@@ -117,7 +117,8 @@ <h2 class="no-num no-toc" id="toc">Table of Contents</h2>
    <li><a href="#web-idl"><span class="secno">2.1 </span>Web IDL</a></ul></li>
  <li><a href="#terminology"><span class="secno">3 </span>Terminology</a>
   <ul class="toc">
-   <li><a href="#css-pixels"><span class="secno">3.1 </span>CSS pixels</a></ul></li>
+   <li><a href="#css-pixels"><span class="secno">3.1 </span>CSS pixels</a></li>
+   <li><a href="#zooming"><span class="secno">3.2 </span>Zooming</a></ul></li>
  <li><a href="#common-infrastructure"><span class="secno">4 </span>Common Infrastructure</a>
   <ul class="toc">
    <li><a href="#scrolling"><span class="secno">4.1 </span>Scrolling</a></ul></li>
@@ -433,6 +434,11 @@ <h3 id="css-pixels"><span class="secno">3.1 </span>CSS pixels</h3>
 are explicitly given there.</p>
 
 
+<h3 id="zooming"><span class="secno">3.2 </span>Zooming</h3>
+
+<p>There are two kinds of zoom, <dfn id="page-zoom">page zoom</dfn> which affects the size of the initial viewport<!-- XXX ref -->, and <dfn id="pinch-zoom">pinch zoom</dfn> which acts like
+a magnifying glass and does not affect the initial viewport<!-- XXX ref --> or actual viewport<!-- XXX ref -->. <a href="#refsCSSDEVICEADAPT">[CSSDEVICEADAPT]</a>
+
 
 <h2 id="common-infrastructure"><span class="secno">4 </span>Common Infrastructure</h2>
 
@@ -706,9 +712,15 @@ <h2 id="extensions-to-the-window-interface"><span class="secno">5 </span>Extensi
 client window. If there is no client window this
 attribute must return zero. <!--fingerprint--></p>
 
-<p>The <dfn id="dom-window-devicepixelratio" title="dom-Window-devicePixelRatio"><code>devicePixelRatio</code></dfn> attribute must return the result of dividing the size of a CSS pixel at 100%
-zoom by the size of a device pixel of the output device, in one dimension (vertical or horizontal). If the device pixel is not square, then the smaller of the
-vertical or horizontal size of the smallest bounding box of the device pixel must be used.
+<p>The <dfn id="dom-window-devicepixelratio" title="dom-Window-devicePixelRatio"><code>devicePixelRatio</code></dfn> attribute must return the result of the following algorithm:
+
+<ol>
+ <li><p>Let <var>CSS pixel size</var> be the size of a CSS pixel at the current <a href="#page-zoom">page zoom</a> scale factor and at a <a href="#pinch-zoom">pinch zoom</a> scale
+ factor of 1.0.
+ <li><p>Let <var>device pixel size</var> be the size of a device pixel of the output device, in one dimension (vertical or horizontal). If the device pixel is
+ not square, then use the smaller of the vertical or horizontal size of the smallest bounding box of the device pixel.
+ <li><p>Return the result of dividing <var>CSS pixel size</var> by <var>device pixel size</var>.
+</ol>
 
 
 <h4 id="the-features-argument-to-the-open()-method"><span class="secno">5.1 </span>The <var>features</var> argument to the <code title="">open()</code> method</h4>
@@ -1884,9 +1896,9 @@ <h2 id="events"><span class="secno">12 </span>Events</h2>
 
 <h3 id="resizing-viewports"><span class="secno">12.1 </span>Resizing viewports</h3>
 
-<p>Whenever a <a href="#viewport">viewport</a> has its width or height changed (e.g. as a result of the user resizing the browser window, or zooming in, or an
-<code title="">iframe</code> element's dimensions are changed), the user agent must <a class="external" data-anolis-spec="html" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#queue-a-task">queue a task</a> to
-<a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#concept-event-fire" title="concept-event-fire">fire an event</a> event named
+<p>Whenever a <a href="#viewport">viewport</a> has its width or height changed (e.g. as a result of the user resizing the browser window, or changing the <a href="#page-zoom">page
+zoom</a> scale factor, or an <code title="">iframe</code> element's dimensions are changed), the user agent must <a class="external" data-anolis-spec="html" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#queue-a-task">queue a task</a>
+to <a class="external" data-anolis-spec="dom" href="http://dom.spec.whatwg.org/#concept-event-fire" title="concept-event-fire">fire an event</a> event named
 <code title="">resize</code> at the <code class="external" data-anolis-spec="html"><a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/browsers.html#window">Window</a></code> object associated with that
 <a href="#viewport">viewport</a>. If such a resize is ongoing over a period of time, the user agent must <a class="external" data-anolis-spec="html" href="http://www.whatwg.org/specs/web-apps/current-work/multipage/webappapis.html#queue-a-task" title="queue a task">queue</a> that
 task at a user-agent-defined interval while the resize is ongoing. <!--fingerprint--> <!-- e.g. if you change the width of an iframe with a transition -->
@@ -1943,6 +1955,9 @@ <h2 class="no-num" id="references">References</h2>
 <div id="anolis-references"><dl><dt id="refsCSSBOX">[CSSBOX]
 <dd><cite><a href="http://dev.w3.org/csswg/css-box/">CSS basic box model</a></cite>, Bert Bos and Anton Prowse. W3C.
 
+<dt id="refsCSSDEVICEADAPT">[CSSDEVICEADAPT]
+<dd><cite><a href="http://dev.w3.org/csswg/css-device-adapt/">CSS Device Adaptation</a></cite>, Rune Lillesveen, Øyvind Stenhaug and Florian Rivoal.
+
 <dt id="refsCSSOM">[CSSOM]
 <dd><cite><a href="http://dev.w3.org/csswg/cssom/">CSS Object Model (CSSOM)</a></cite>, Simon Pieters and Glenn Adams. W3C.
 

cssom-view/Overview.src.html

@@ -391,6 +391,11 @@ <h3>CSS pixels</h3>
 are explicitly given there.</p>
 
 
+<h3>Zooming</h3>
+
+<p>There are two kinds of zoom, <dfn>page zoom</dfn> which affects the size of the initial viewport<!-- XXX ref -->, and <dfn>pinch zoom</dfn> which acts like
+a magnifying glass and does not affect the initial viewport<!-- XXX ref --> or actual viewport<!-- XXX ref -->. <span data-anolis-ref>CSSDEVICEADAPT</span>
+
 
 <h2>Common Infrastructure</h2>
 
@@ -664,9 +669,15 @@ <h2>Extensions to the <code title>Window</code> Interface</h2>
 client window. If there is no client window this
 attribute must return zero. <!--fingerprint--></p>
 
-<p>The <dfn title=dom-Window-devicePixelRatio><code>devicePixelRatio</code></dfn> attribute must return the result of dividing the size of a CSS pixel at 100%
-zoom by the size of a device pixel of the output device, in one dimension (vertical or horizontal). If the device pixel is not square, then the smaller of the
-vertical or horizontal size of the smallest bounding box of the device pixel must be used.
+<p>The <dfn title=dom-Window-devicePixelRatio><code>devicePixelRatio</code></dfn> attribute must return the result of the following algorithm:
+
+<ol>
+ <li><p>Let <var>CSS pixel size</var> be the size of a CSS pixel at the current <span>page zoom</span> scale factor and at a <span>pinch zoom</span> scale
+ factor of 1.0.
+ <li><p>Let <var>device pixel size</var> be the size of a device pixel of the output device, in one dimension (vertical or horizontal). If the device pixel is
+ not square, then use the smaller of the vertical or horizontal size of the smallest bounding box of the device pixel.
+ <li><p>Return the result of dividing <var>CSS pixel size</var> by <var>device pixel size</var>.
+</ol>
 
 
 <h4>The <var>features</var> argument to the <code title>open()</code> method</h4>
@@ -1842,9 +1853,9 @@ <h2>Events</h2>
 
 <h3>Resizing viewports</h3>
 
-<p>Whenever a <span>viewport</span> has its width or height changed (e.g. as a result of the user resizing the browser window, or zooming in, or an
-<code title>iframe</code> element's dimensions are changed), the user agent must <span data-anolis-spec=html>queue a task</span> to
-<span data-anolis-spec=dom title=concept-event-fire>fire an event</span> event named
+<p>Whenever a <span>viewport</span> has its width or height changed (e.g. as a result of the user resizing the browser window, or changing the <span>page
+zoom</span> scale factor, or an <code title>iframe</code> element's dimensions are changed), the user agent must <span data-anolis-spec=html>queue a task</span>
+to <span data-anolis-spec=dom title=concept-event-fire>fire an event</span> event named
 <code title>resize</code> at the <code data-anolis-spec=html>Window</code> object associated with that
 <span>viewport</span>. If such a resize is ongoing over a period of time, the user agent must <span data-anolis-spec=html title="queue a task">queue</span> that
 task at a user-agent-defined interval while the resize is ongoing. <!--fingerprint--> <!-- e.g. if you change the width of an iframe with a transition -->

cssom/Overview.html

@@ -16,7 +16,7 @@
  <h1>CSS Object Model (CSSOM)</h1>
 
 
- <h2 class="no-num no-toc" id="w3c-doctype">Editor's Draft 10 October 2013</h2>
+ <h2 class="no-num no-toc" id="w3c-doctype">Editor's Draft 17 October 2013</h2>
 
  <dl>
 
@@ -90,7 +90,7 @@ <h2 class="no-num no-toc" id="sotd">Status of This Document</h2>
 can be found in the
 <a href="http://www.w3.org/TR/">W3C technical reports index at http://www.w3.org/TR/.</a></em>
 
-<p class="dontpublish">This is the 10 October 2013 Editor's Draft of CSSOM. Please send comments to
+<p class="dontpublish">This is the 17 October 2013 Editor's Draft of CSSOM. Please send comments to
 <a href="mailto:www-style@w3.org?subject=%5Bcssom%5D%20">www-style@w3.org</a>
 (<a href="http://lists.w3.org/Archives/Public/www-style/">archived</a>)
 with <samp>[cssom]</samp> at the start of the subject line.