Apply same-origin clarifications after whatwg#5165

source

@@ -28064,8 +28064,7 @@ was an English &lt;a href="/wiki/Music_hall">music hall&lt;/a> singer, ...</code
  <code>img</code> element <var>img</var>:
  <ol>
  <li><p>Let <var>dim</var> be <var>img</var>'s <span>current request</span>'s <span>preferred density-corrected dimensions</span>.
- <li><p>If <var>dim</var> is not undefined, return <var>dim</var>.</p></li>
- <li><p>Set <var>dim</var> to <var>img</var>'s <span>intrinsic dimensions</span>.</p></li>
+ <li><p>If <var>dim</var> is undefined, set <var>dim</var> to <var>img</var>'s <span>intrinsic dimensions</span>.</p></li>
  <li><p>Set <var>dim</var>'s width and height to <var>dim</var> divided by <var>img</var>'s <span>current pixel density</span>.</p></li>
  <li><p>Return <var>dim</var>.
  </ol>
@@ -28724,8 +28723,6 @@ was an English &lt;a href="/wiki/Music_hall">music hall&lt;/a> singer, ...</code
  <p>When asked to <dfn>update the image metadata</dfn> for a given <span>image request</span> <var>req</var>, user agents must do the following:</p>
 
  <ol>
- <li><p>If <var>img</var>'s <span>origin</span> is not <span>same origin</span> with <span>entry
- settings object</span>'s <span data-x="concept-settings-object-origin">origin</span>, return.</p></li>
  <li><p>Let <var>exifTagMap</var> be the EXIF tags obtained from <var>req</var>, as defined by the relevant codec. <ref spec=EXIF></p></li>
  <li><p>Let <var>dimX</var> be the value of <var>exifTagMap</var>'s tag <code data-x="">0xA002</code> (<code data-x="">PixelXDimension</code>).</p></li>
  <li><p>Let <var>dimY</var> be the value of <var>exifTagMap</var>'s tag <code data-x="">0xA003</code> (<code data-x="">PixelYDimension</code>).</p></li>
@@ -28740,8 +28737,17 @@ was an English &lt;a href="/wiki/Music_hall">music hall&lt;/a> singer, ...</code
  <li><p>Let <var>widthFromDensity</var> be the value of <var>img</var>'s width, multiplied by <code data-x="">72</code> and divided by <var>resX</var>.</p></li>
  <li><p>Let <var>heightFromDensity</var> be the value of <var>img</var>'s height, multiplied by <code data-x="">72</code> and divided by <var>resY</var>.</p></li>
 
- <li><p>If <var>widthFromDensity</var> is equal to <var>dimX</var>, and <var>heightFromDensity</var> is equal to <var>dimY</var>,
- set <var>img</var>'s <span>preferred density-corrected dimensions</span> to <var>dimX</var> and <var>dimY</var>.</p></li>
+ <li><p>If <var>widthFromDensity</var> is not equal to <var>dimX</var> or <var>heightFromDensity</var> is not equal to <var>dimY</var>, return.</p></li>
+
+ <li><p><li><p>If <var>img</var>'s <span>origin</span> is not <span>same origin</span> with <span>entry
+ settings object</span>'s <span data-x="concept-settings-object-origin">origin</span>, set <var>img</var>'s <span>intrinsic dimensions</span>
+ to <var>dimX</var> and <var>dimY</var>, scale <var>img</var>'s pixel data accordingly, and return.</p>
+
+ <p class="note">This step is done to hide metadata for opaque resources from being detected. See
+ <a href="https://github.com/w3c/csswg-drafts/issues/5165">issue #5165</a></p>
+ </li>
+
+ <li><p>Set <var>img</var>'s <span>preferred density-corrected dimensions</span> to <var>dimX</var> and <var>dimY</var>.</p></li>
 
  <li><p>Return.</p></li>
  </ol>