<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207537] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207537">207537</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-19 08:10:07 -0700 (Wed, 19 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove SecurityOrigin::taintsCanvas
https://bugs.webkit.org/show_bug.cgi?id=163594
Patch by Youenn Fablet <youenn@apple.com> on 2016-10-19
Reviewed by Darin Adler.
No change of behavior.
* html/canvas/CanvasRenderingContext.cpp:
(WebCore::CanvasRenderingContext::wouldTaintOrigin):
* page/SecurityOrigin.cpp:
(WebCore::SecurityOrigin::canReceiveDragData):
(WebCore::SecurityOrigin::taintsCanvas): Deleted.
* page/SecurityOrigin.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContextcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOrigincpp">trunk/Source/WebCore/page/SecurityOrigin.cpp</a></li>
<li><a href="#trunkSourceWebCorepageSecurityOriginh">trunk/Source/WebCore/page/SecurityOrigin.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207536 => 207537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-19 15:07:19 UTC (rev 207536)
+++ trunk/Source/WebCore/ChangeLog 2016-10-19 15:10:07 UTC (rev 207537)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-10-19 Youenn Fablet <youenn@apple.com>
+
+ Remove SecurityOrigin::taintsCanvas
+ https://bugs.webkit.org/show_bug.cgi?id=163594
+
+ Reviewed by Darin Adler.
+
+ No change of behavior.
+
+ * html/canvas/CanvasRenderingContext.cpp:
+ (WebCore::CanvasRenderingContext::wouldTaintOrigin):
+ * page/SecurityOrigin.cpp:
+ (WebCore::SecurityOrigin::canReceiveDragData):
+ (WebCore::SecurityOrigin::taintsCanvas): Deleted.
+ * page/SecurityOrigin.h:
+
</ins><span class="cx"> 2016-10-18 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Fix compound selector parsing.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp (207536 => 207537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp 2016-10-19 15:07:19 UTC (rev 207536)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext.cpp 2016-10-19 15:10:07 UTC (rev 207537)
</span><span class="lines">@@ -101,13 +101,10 @@
</span><span class="cx"> if (!canvas()->originClean())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (canvas()->securityOrigin()->taintsCanvas(url))
- return true;
-
</del><span class="cx"> if (url.protocolIsData())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return false;
</del><ins>+ return !canvas()->securityOrigin()->canRequest(url);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CanvasRenderingContext::checkOrigin(const URL& url)
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOrigincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.cpp (207536 => 207537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.cpp 2016-10-19 15:07:19 UTC (rev 207536)
+++ trunk/Source/WebCore/page/SecurityOrigin.cpp 2016-10-19 15:10:07 UTC (rev 207537)
</span><span class="lines">@@ -298,29 +298,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SecurityOrigin::taintsCanvas(const URL& url) const
-{
- if (canRequest(url))
- return false;
-
- // This function exists because we treat data URLs as having a unique origin,
- // contrary to the current (9/19/2009) draft of the HTML5 specification.
- // We still want to let folks paint data URLs onto untainted canvases, so
- // we special case data URLs below. If we change to match HTML5 w.r.t.
- // data URL security, then we can remove this function in favor of
- // !canRequest.
- if (url.protocolIsData())
- return false;
-
- return true;
-}
-
</del><span class="cx"> bool SecurityOrigin::canReceiveDragData(const SecurityOrigin* dragInitiator) const
</span><span class="cx"> {
</span><span class="cx"> if (this == dragInitiator)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- return canAccess(dragInitiator);
</del><ins>+ return canAccess(dragInitiator);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This is a hack to allow keep navigation to http/https feeds working. To remove this
</span></span></pre></div>
<a id="trunkSourceWebCorepageSecurityOriginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/SecurityOrigin.h (207536 => 207537)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/SecurityOrigin.h 2016-10-19 15:07:19 UTC (rev 207536)
+++ trunk/Source/WebCore/page/SecurityOrigin.h 2016-10-19 15:10:07 UTC (rev 207537)
</span><span class="lines">@@ -106,11 +106,6 @@
</span><span class="cx"> // XMLHttpRequests.
</span><span class="cx"> bool canRequest(const URL&) const;
</span><span class="cx">
</span><del>- // Returns true if drawing an image from this URL taints a canvas from
- // this security origin. For example, call this function before
- // drawing an image onto an HTML canvas element with the drawImage API.
- bool taintsCanvas(const URL&) const;
-
</del><span class="cx"> // Returns true if this SecurityOrigin can receive drag content from the
</span><span class="cx"> // initiator. For example, call this function before allowing content to be
</span><span class="cx"> // dropped onto a target.
</span></span></pre>
</div>
</div>
</body>
</html>