[html5] r6789 - [giow] (2) Go back to ignoring document.domain changes for the purposes of canva [...]

whatwg at whatwg.org whatwg at whatwg.org
Sun Oct 30 11:11:52 PDT 2011


Author: ianh
Date: 2011-10-30 11:11:50 -0700 (Sun, 30 Oct 2011)
New Revision: 6789

Modified:
   complete.html
   index
   source
Log:
[giow] (2) Go back to ignoring document.domain changes for the purposes of canvas tainting.
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=14502

Modified: complete.html
===================================================================
--- complete.html	2011-10-30 17:53:51 UTC (rev 6788)
+++ complete.html	2011-10-30 18:11:50 UTC (rev 6789)
@@ -38417,9 +38417,9 @@
   <ul><li><p>The element's 2D context's <code title=dom-context-2d-drawImage><a href=#dom-context-2d-drawimage>drawImage()</a></code> method is
    called with an <code><a href=#htmlimageelement>HTMLImageElement</a></code> or an
    <code><a href=#htmlvideoelement>HTMLVideoElement</a></code> whose <a href=#origin>origin</a> is not the
-   <a href=#same-origin title="same origin">same</a> as the <span>effective
-   origin</span> of the <code><a href=#document>Document</a></code> object that owns the
-   <code><a href=#the-canvas-element>canvas</a></code> element.</li>
+   <a href=#same-origin title="same origin">same</a> as that of the
+   <code><a href=#document>Document</a></code> object that owns the <code><a href=#the-canvas-element>canvas</a></code>
+   element.</li>
 
    <li><p>The element's 2D context's <code title=dom-context-2d-drawImage><a href=#dom-context-2d-drawimage>drawImage()</a></code> method is
    called with an <code><a href=#htmlcanvaselement>HTMLCanvasElement</a></code> whose
@@ -38429,9 +38429,9 @@
    to a <code><a href=#canvaspattern>CanvasPattern</a></code> object that was created from an
    <code><a href=#htmlimageelement>HTMLImageElement</a></code> or an <code><a href=#htmlvideoelement>HTMLVideoElement</a></code>
    whose <a href=#origin>origin</a> was not the <a href=#same-origin title="same
-   origin">same</a> as the <span>effective origin</span> of the
-   <code><a href=#document>Document</a></code> object that owns the <code><a href=#the-canvas-element>canvas</a></code>
-   element when the pattern was created.</li>
+   origin">same</a> as that of the <code><a href=#document>Document</a></code> object
+   that owns the <code><a href=#the-canvas-element>canvas</a></code> element when the pattern was
+   created.</li>
 
    <li><p>The element's 2D context's <code title=dom-context-2d-fillStyle><a href=#dom-context-2d-fillstyle>fillStyle</a></code> attribute is set
    to a <code><a href=#canvaspattern>CanvasPattern</a></code> object that was created from an
@@ -38442,9 +38442,9 @@
    set to a <code><a href=#canvaspattern>CanvasPattern</a></code> object that was created from an
    <code><a href=#htmlimageelement>HTMLImageElement</a></code> or an <code><a href=#htmlvideoelement>HTMLVideoElement</a></code>
    whose <a href=#origin>origin</a> was not the <a href=#same-origin title="same
-   origin">same</a> as the <span>effective origin</span> of the
-   <code><a href=#document>Document</a></code> object that owns the <code><a href=#the-canvas-element>canvas</a></code>
-   element when the pattern was created.</li>
+   origin">same</a> as that of the <code><a href=#document>Document</a></code> object
+   that owns the <code><a href=#the-canvas-element>canvas</a></code> element when the pattern was
+   created.</li>
 
    <li><p>The element's 2D context's <code title=dom-context-2d-strokeStyle><a href=#dom-context-2d-strokestyle>strokeStyle</a></code> attribute is
    set to a <code><a href=#canvaspattern>CanvasPattern</a></code> object that was created from an
@@ -38453,14 +38453,14 @@
 
    <li><p>The element's 2D context's <code title=dom-context-2d-fillText><a href=#dom-context-2d-filltext>fillText()</a></code> or <code title=dom-context-2d-fillText><a href=#dom-context-2d-filltext>strokeText()</a></code> methods are
    invoked and consider using a font that has an <a href=#origin>origin</a>
-   that is not the <a href=#same-origin title="same origin">same</a> as the
-   <span>effective origin</span> of the <code><a href=#document>Document</a></code> object
-   that owns the <code><a href=#the-canvas-element>canvas</a></code> element. (The font doesn't even
-   have to be used; all that matters is whether the font was
-   considered for any of the glyphs drawn.)</li> <!-- because
-   fonts could consider sensitive material, I guess; and because that
-   sensitivity could extend to whether or not a particular glyph is in
-   the font in the first place. -->
+   that is not the <a href=#same-origin title="same origin">same</a> as that of
+   the <code><a href=#document>Document</a></code> object that owns the <code><a href=#the-canvas-element>canvas</a></code>
+   element. (The font doesn't even have to be used; all that matters
+   is whether the font was considered for any of the glyphs
+   drawn.)</li> <!-- because fonts could consider sensitive
+   material, I guess; and because that sensitivity could extend to
+   whether or not a particular glyph is in the font in the first
+   place. -->
 
   </ul><p>Whenever the <code title=dom-canvas-toDataURL><a href=#dom-canvas-todataurl>toDataURL()</a></code> method of a
   <code><a href=#the-canvas-element>canvas</a></code> element whose <i>origin-clean</i> flag is set to
@@ -38476,10 +38476,9 @@
   <p>Whenever the <code title=dom-context-2d-measureText><a href=#dom-context-2d-measuretext>measureText()</a></code> method of
   the 2D context of a <code><a href=#the-canvas-element>canvas</a></code> element ends up using a font
   that has an <a href=#origin>origin</a> that is not the <a href=#same-origin title="same
-  origin">same</a> as the <span>effective origin</span> of the
-  <code><a href=#document>Document</a></code> object that owns the <code><a href=#the-canvas-element>canvas</a></code>
-  element, the method must throw a <code><a href=#securityerror>SecurityError</a></code>
-  exception.</p>
+  origin">same</a> as that of the <code><a href=#document>Document</a></code> object that
+  owns the <code><a href=#the-canvas-element>canvas</a></code> element, the method must throw a
+  <code><a href=#securityerror>SecurityError</a></code> exception.</p>
 
   <p class=note>Even resetting the canvas state by changing its
   <code title=attr-canvas-width><a href=#attr-canvas-width>width</a></code> or <code title=attr-canvas-height><a href=#attr-canvas-height>height</a></code> attributes doesn't reset

Modified: index
===================================================================
--- index	2011-10-30 17:53:51 UTC (rev 6788)
+++ index	2011-10-30 18:11:50 UTC (rev 6789)
@@ -38417,9 +38417,9 @@
   <ul><li><p>The element's 2D context's <code title=dom-context-2d-drawImage><a href=#dom-context-2d-drawimage>drawImage()</a></code> method is
    called with an <code><a href=#htmlimageelement>HTMLImageElement</a></code> or an
    <code><a href=#htmlvideoelement>HTMLVideoElement</a></code> whose <a href=#origin>origin</a> is not the
-   <a href=#same-origin title="same origin">same</a> as the <span>effective
-   origin</span> of the <code><a href=#document>Document</a></code> object that owns the
-   <code><a href=#the-canvas-element>canvas</a></code> element.</li>
+   <a href=#same-origin title="same origin">same</a> as that of the
+   <code><a href=#document>Document</a></code> object that owns the <code><a href=#the-canvas-element>canvas</a></code>
+   element.</li>
 
    <li><p>The element's 2D context's <code title=dom-context-2d-drawImage><a href=#dom-context-2d-drawimage>drawImage()</a></code> method is
    called with an <code><a href=#htmlcanvaselement>HTMLCanvasElement</a></code> whose
@@ -38429,9 +38429,9 @@
    to a <code><a href=#canvaspattern>CanvasPattern</a></code> object that was created from an
    <code><a href=#htmlimageelement>HTMLImageElement</a></code> or an <code><a href=#htmlvideoelement>HTMLVideoElement</a></code>
    whose <a href=#origin>origin</a> was not the <a href=#same-origin title="same
-   origin">same</a> as the <span>effective origin</span> of the
-   <code><a href=#document>Document</a></code> object that owns the <code><a href=#the-canvas-element>canvas</a></code>
-   element when the pattern was created.</li>
+   origin">same</a> as that of the <code><a href=#document>Document</a></code> object
+   that owns the <code><a href=#the-canvas-element>canvas</a></code> element when the pattern was
+   created.</li>
 
    <li><p>The element's 2D context's <code title=dom-context-2d-fillStyle><a href=#dom-context-2d-fillstyle>fillStyle</a></code> attribute is set
    to a <code><a href=#canvaspattern>CanvasPattern</a></code> object that was created from an
@@ -38442,9 +38442,9 @@
    set to a <code><a href=#canvaspattern>CanvasPattern</a></code> object that was created from an
    <code><a href=#htmlimageelement>HTMLImageElement</a></code> or an <code><a href=#htmlvideoelement>HTMLVideoElement</a></code>
    whose <a href=#origin>origin</a> was not the <a href=#same-origin title="same
-   origin">same</a> as the <span>effective origin</span> of the
-   <code><a href=#document>Document</a></code> object that owns the <code><a href=#the-canvas-element>canvas</a></code>
-   element when the pattern was created.</li>
+   origin">same</a> as that of the <code><a href=#document>Document</a></code> object
+   that owns the <code><a href=#the-canvas-element>canvas</a></code> element when the pattern was
+   created.</li>
 
    <li><p>The element's 2D context's <code title=dom-context-2d-strokeStyle><a href=#dom-context-2d-strokestyle>strokeStyle</a></code> attribute is
    set to a <code><a href=#canvaspattern>CanvasPattern</a></code> object that was created from an
@@ -38453,14 +38453,14 @@
 
    <li><p>The element's 2D context's <code title=dom-context-2d-fillText><a href=#dom-context-2d-filltext>fillText()</a></code> or <code title=dom-context-2d-fillText><a href=#dom-context-2d-filltext>strokeText()</a></code> methods are
    invoked and consider using a font that has an <a href=#origin>origin</a>
-   that is not the <a href=#same-origin title="same origin">same</a> as the
-   <span>effective origin</span> of the <code><a href=#document>Document</a></code> object
-   that owns the <code><a href=#the-canvas-element>canvas</a></code> element. (The font doesn't even
-   have to be used; all that matters is whether the font was
-   considered for any of the glyphs drawn.)</li> <!-- because
-   fonts could consider sensitive material, I guess; and because that
-   sensitivity could extend to whether or not a particular glyph is in
-   the font in the first place. -->
+   that is not the <a href=#same-origin title="same origin">same</a> as that of
+   the <code><a href=#document>Document</a></code> object that owns the <code><a href=#the-canvas-element>canvas</a></code>
+   element. (The font doesn't even have to be used; all that matters
+   is whether the font was considered for any of the glyphs
+   drawn.)</li> <!-- because fonts could consider sensitive
+   material, I guess; and because that sensitivity could extend to
+   whether or not a particular glyph is in the font in the first
+   place. -->
 
   </ul><p>Whenever the <code title=dom-canvas-toDataURL><a href=#dom-canvas-todataurl>toDataURL()</a></code> method of a
   <code><a href=#the-canvas-element>canvas</a></code> element whose <i>origin-clean</i> flag is set to
@@ -38476,10 +38476,9 @@
   <p>Whenever the <code title=dom-context-2d-measureText><a href=#dom-context-2d-measuretext>measureText()</a></code> method of
   the 2D context of a <code><a href=#the-canvas-element>canvas</a></code> element ends up using a font
   that has an <a href=#origin>origin</a> that is not the <a href=#same-origin title="same
-  origin">same</a> as the <span>effective origin</span> of the
-  <code><a href=#document>Document</a></code> object that owns the <code><a href=#the-canvas-element>canvas</a></code>
-  element, the method must throw a <code><a href=#securityerror>SecurityError</a></code>
-  exception.</p>
+  origin">same</a> as that of the <code><a href=#document>Document</a></code> object that
+  owns the <code><a href=#the-canvas-element>canvas</a></code> element, the method must throw a
+  <code><a href=#securityerror>SecurityError</a></code> exception.</p>
 
   <p class=note>Even resetting the canvas state by changing its
   <code title=attr-canvas-width><a href=#attr-canvas-width>width</a></code> or <code title=attr-canvas-height><a href=#attr-canvas-height>height</a></code> attributes doesn't reset

Modified: source
===================================================================
--- source	2011-10-30 17:53:51 UTC (rev 6788)
+++ source	2011-10-30 18:11:50 UTC (rev 6789)
@@ -42553,9 +42553,9 @@
    title="dom-context-2d-drawImage">drawImage()</code> method is
    called with an <code>HTMLImageElement</code> or an
    <code>HTMLVideoElement</code> whose <span>origin</span> is not the
-   <span title="same origin">same</span> as the <span>effective
-   origin</span> of the <code>Document</code> object that owns the
-   <code>canvas</code> element.</p></li>
+   <span title="same origin">same</span> as that of the
+   <code>Document</code> object that owns the <code>canvas</code>
+   element.</p></li>
 
    <li><p>The element's 2D context's <code
    title="dom-context-2d-drawImage">drawImage()</code> method is
@@ -42567,9 +42567,9 @@
    to a <code>CanvasPattern</code> object that was created from an
    <code>HTMLImageElement</code> or an <code>HTMLVideoElement</code>
    whose <span>origin</span> was not the <span title="same
-   origin">same</span> as the <span>effective origin</span> of the
-   <code>Document</code> object that owns the <code>canvas</code>
-   element when the pattern was created.</p></li>
+   origin">same</span> as that of the <code>Document</code> object
+   that owns the <code>canvas</code> 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
@@ -42582,9 +42582,9 @@
    set to a <code>CanvasPattern</code> object that was created from an
    <code>HTMLImageElement</code> or an <code>HTMLVideoElement</code>
    whose <span>origin</span> was not the <span title="same
-   origin">same</span> as the <span>effective origin</span> of the
-   <code>Document</code> object that owns the <code>canvas</code>
-   element when the pattern was created.</p></li>
+   origin">same</span> as that of the <code>Document</code> object
+   that owns the <code>canvas</code> 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
@@ -42596,14 +42596,14 @@
    title="dom-context-2d-fillText">fillText()</code> or <code
    title="dom-context-2d-fillText">strokeText()</code> methods are
    invoked and consider using a font that has an <span>origin</span>
-   that is not the <span title="same origin">same</span> as the
-   <span>effective origin</span> of the <code>Document</code> object
-   that owns the <code>canvas</code> element. (The font doesn't even
-   have to be used; all that matters is whether the font was
-   considered for any of the glyphs drawn.)</p></li> <!-- because
-   fonts could consider sensitive material, I guess; and because that
-   sensitivity could extend to whether or not a particular glyph is in
-   the font in the first place. -->
+   that is not the <span title="same origin">same</span> as that of
+   the <code>Document</code> object that owns the <code>canvas</code>
+   element. (The font doesn't even have to be used; all that matters
+   is whether the font was considered for any of the glyphs
+   drawn.)</p></li> <!-- because fonts could consider sensitive
+   material, I guess; and because that sensitivity could extend to
+   whether or not a particular glyph is in the font in the first
+   place. -->
 
   </ul>
 
@@ -42624,10 +42624,9 @@
   title="dom-context-2d-measureText">measureText()</code> method of
   the 2D context of a <code>canvas</code> element ends up using a font
   that has an <span>origin</span> that is not the <span title="same
-  origin">same</span> as the <span>effective origin</span> of the
-  <code>Document</code> object that owns the <code>canvas</code>
-  element, the method must throw a <code>SecurityError</code>
-  exception.</p>
+  origin">same</span> as that of the <code>Document</code> object that
+  owns the <code>canvas</code> element, the method must throw a
+  <code>SecurityError</code> exception.</p>
 
   <p class="note">Even resetting the canvas state by changing its
   <code title="attr-canvas-width">width</code> or <code




More information about the Commit-Watchers mailing list