[html5] r1753 - /

[whatwg at whatwg.org]

Author: ianh
Date: 2008-06-12 16:00:50 -0700 (Thu, 12 Jun 2008)
New Revision: 1753

Modified:
   index
   source
Log:
[gow] (2) Clean up the security processing model for <canvas>.

Modified: index
===================================================================
--- index	2008-06-12 22:53:37 UTC (rev 1752)
+++ index	2008-06-12 23:00:50 UTC (rev 1753)
@@ -20629,16 +20629,17 @@
      href="#fillstyle">fillStyle</a></code> attribute is set to a <code><a
      href="#canvaspattern0">CanvasPattern</a></code> object that was created
      from an <code><a href="#htmlimageelement">HTMLImageElement</a></code>
-     whose <a href="#origin0">origin</a> is not the <a href="#same-origin"
+     whose <a href="#origin0">origin</a> was not the <a href="#same-origin"
      title="same origin">same</a> as that of the <code>Document</code> object
-     that owns the <code><a href="#canvas">canvas</a></code> element.
+     that owns the <code><a href="#canvas">canvas</a></code> element when the
+     pattern was created.
 
    <li>
     <p>The element's 2D context's <code title=dom-context-2d-fillStyle><a
      href="#fillstyle">fillStyle</a></code> attribute is set to a <code><a
      href="#canvaspattern0">CanvasPattern</a></code> object that was created
      from an <code><a href="#htmlcanvaselement">HTMLCanvasElement</a></code>
-     whose <i>origin-clean</i> flag is false.
+     whose <i>origin-clean</i> flag was false when the pattern was created.
 
    <li>
     <p>The element's 2D context's <code title=dom-context-2d-strokeStyle><a
@@ -20646,9 +20647,10 @@
      <code><a href="#canvaspattern0">CanvasPattern</a></code> object that was
      created from an <code><a
      href="#htmlimageelement">HTMLImageElement</a></code> whose <a
-     href="#origin0">origin</a> is not the <a href="#same-origin" title="same
-     origin">same</a> as that of the <code>Document</code> object that owns
-     the <code><a href="#canvas">canvas</a></code> element.
+     href="#origin0">origin</a> was not the <a href="#same-origin"
+     title="same origin">same</a> as that of the <code>Document</code> object
+     that owns the <code><a href="#canvas">canvas</a></code> element when the
+     pattern was created.
 
    <li>
     <p>The element's 2D context's <code title=dom-context-2d-strokeStyle><a
@@ -20656,20 +20658,21 @@
      <code><a href="#canvaspattern0">CanvasPattern</a></code> object that was
      created from an <code><a
      href="#htmlcanvaselement">HTMLCanvasElement</a></code> whose
-     <i>origin-clean</i> flag is false.
+     <i>origin-clean</i> flag was false when the pattern was created.
   </ul>
 
   <p>Whenever the <code title=dom-canvas-toDataURL><a
    href="#todataurl">toDataURL()</a></code> method of a <code><a
    href="#canvas">canvas</a></code> element whose <i>origin-clean</i> flag is
-   set to false is called, the method must immediately raise a security
-   exception.
+   set to false is called, the method must raise a <a
+   href="#security9">security exception</a>.
 
   <p>Whenever the <code title=dom-context-2d-getImageData><a
    href="#getimagedata">getImageData()</a></code> method of the 2D context of
    a <code><a href="#canvas">canvas</a></code> element whose
-   <i>origin-clean</i> flag is set to false is called, the method must
-   immediately raise a security exception.
+   <i>origin-clean</i> flag is set to false is called with otherwise correct
+   arguments, the method must raise a <a href="#security9">security
+   exception</a>.
 
   <h4 id=the-map><span class=secno>3.11.12 </span>The <dfn
    id=map><code>map</code></dfn> element</h4>

Modified: source
===================================================================
--- source	2008-06-12 22:53:37 UTC (rev 1752)
+++ source	2008-06-12 23:00:50 UTC (rev 1753)
@@ -18297,44 +18297,45 @@
    <li><p>The element's 2D context's <code
    title="dom-context-2d-fillStyle">fillStyle</code> attribute is set
    to a <code>CanvasPattern</code> object that was created from an
-   <code>HTMLImageElement</code> whose <span>origin</span> is not the
+   <code>HTMLImageElement</code> whose <span>origin</span> was not the
    <span title="same origin">same</span> as that of the
    <code>Document</code> object that owns the <code>canvas</code>
-   element.</p></li>
+   element when the pattern was created.</p></li>
 
    <li><p>The element's 2D context's <code
    title="dom-context-2d-fillStyle">fillStyle</code> attribute is set
    to a <code>CanvasPattern</code> object that was created from an
-   <code>HTMLCanvasElement</code> whose <i>origin-clean</i> flag is
-   false.</p></li>
+   <code>HTMLCanvasElement</code> whose <i>origin-clean</i> flag was
+   false when the pattern was created.</p></li>
 
    <li><p>The element's 2D context's <code
    title="dom-context-2d-strokeStyle">strokeStyle</code> attribute is
    set to a <code>CanvasPattern</code> object that was created from an
-   <code>HTMLImageElement</code> whose <span>origin</span> is not the
+   <code>HTMLImageElement</code> whose <span>origin</span> was not the
    <span title="same origin">same</span> as that of the
    <code>Document</code> object that owns the <code>canvas</code>
-   element.</p></li>
+   element when the pattern was created.</p></li>
 
    <li><p>The element's 2D context's <code
    title="dom-context-2d-strokeStyle">strokeStyle</code> attribute is
    set to a <code>CanvasPattern</code> object that was created from an
-   <code>HTMLCanvasElement</code> whose <i>origin-clean</i> flag is
-   false.</p></li>
+   <code>HTMLCanvasElement</code> whose <i>origin-clean</i> flag was
+   false when the pattern was created.</p></li>
 
   </ul>
 
   <p>Whenever the <code
   title="dom-canvas-toDataURL">toDataURL()</code> method of a
   <code>canvas</code> element whose <i>origin-clean</i> flag is set to
-  false is called, the method must immediately raise a security
-  exception.</p>
+  false is called, the method must raise a <span>security
+  exception</span>.</p>
 
   <p>Whenever the <code
   title="dom-context-2d-getImageData">getImageData()</code> method of
   the 2D context of a <code>canvas</code> element whose
-  <i>origin-clean</i> flag is set to false is called, the method must
-  immediately raise a security exception.</p>
+  <i>origin-clean</i> flag is set to false is called with otherwise
+  correct arguments, the method must raise a <span>security
+  exception</span>.</p>