<!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>[173652] trunk</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/173652">173652</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-16 01:13:06 -0700 (Tue, 16 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add version of drawFocusIfNeeded that take a Path2D parameter.
https://bugs.webkit.org/show_bug.cgi?id=136846
Patch by Jinho Bang <jinho.bang@samsung.com> on 2014-09-16
Reviewed by Dirk Schulze.
Source/WebCore:
Tests: fast/canvas/draw-focus-if-needed-with-path.html
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::drawFocusIfNeeded):
(WebCore::CanvasRenderingContext2D::drawFocusIfNeededInternal):
* html/canvas/CanvasRenderingContext2D.h:
* html/canvas/CanvasRenderingContext2D.idl:
LayoutTests:
* fast/canvas/draw-focus-if-needed-expected.txt: Added.
* fast/canvas/draw-focus-if-needed-with-path-expected.txt: Added.
* fast/canvas/draw-focus-if-needed-with-path.html: Added.
* fast/canvas/draw-focus-if-needed.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h</a></li>
<li><a href="#trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Didl">trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcanvasdrawfocusifneededexpectedtxt">trunk/LayoutTests/fast/canvas/draw-focus-if-needed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvasdrawfocusifneededwithpathexpectedtxt">trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvasdrawfocusifneededwithpathhtml">trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path.html</a></li>
<li><a href="#trunkLayoutTestsfastcanvasdrawfocusifneededhtml">trunk/LayoutTests/fast/canvas/draw-focus-if-needed.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173651 => 173652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-09-16 06:53:30 UTC (rev 173651)
+++ trunk/LayoutTests/ChangeLog 2014-09-16 08:13:06 UTC (rev 173652)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-09-16 Jinho Bang <jinho.bang@samsung.com>
+
+ Add version of drawFocusIfNeeded that take a Path2D parameter.
+ https://bugs.webkit.org/show_bug.cgi?id=136846
+
+ Reviewed by Dirk Schulze.
+
+ * fast/canvas/draw-focus-if-needed-expected.txt: Added.
+ * fast/canvas/draw-focus-if-needed-with-path-expected.txt: Added.
+ * fast/canvas/draw-focus-if-needed-with-path.html: Added.
+ * fast/canvas/draw-focus-if-needed.html: Added.
+
</ins><span class="cx"> 2014-09-15 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed Windows gardening. fast/forms/label test expectations now match Mac platform's expectations.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvasdrawfocusifneededexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/draw-focus-if-needed-expected.txt (0 => 173652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/draw-focus-if-needed-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/draw-focus-if-needed-expected.txt 2014-09-16 08:13:06 UTC (rev 173652)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+This test ensures that a focus ring is drawn.
+TEST PASSED
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvasdrawfocusifneededwithpathexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path-expected.txt (0 => 173652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path-expected.txt 2014-09-16 08:13:06 UTC (rev 173652)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+This test ensures that a focus ring is drawn.
+TEST PASSED
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvasdrawfocusifneededwithpathhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path.html (0 => 173652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/draw-focus-if-needed-with-path.html 2014-09-16 08:13:06 UTC (rev 173652)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+This test ensures that a focus ring is drawn.
+<canvas id="canvas" class="output" width="30" height="30">
+ <button id="button1"></button>
+</canvas>
+<div id="console"></div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+var button1 = document.getElementById("button1");
+var canvas = document.getElementById("canvas").getContext("2d");
+var path = new Path2D();
+path.rect(10, 10, 10, 10);
+canvas.drawFocusIfNeeded(path, button1);
+var imagedata = canvas.getImageData(0, 0, 30, 30);
+var total = 0;
+for(var x = 0; x < 30 * 30 * 4; x++)
+ total += imagedata.data[x];
+
+if (total != 0)
+ document.getElementById("console").innerHTML = "TEST PASSED";
+else
+{
+ button1.focus();
+ canvas.drawFocusIfNeeded(path, button1);
+ imagedata = canvas.getImageData(0, 0, 30, 30);
+ for(var x = 0; x < 30 * 30* 4; x++)
+ total += imagedata.data[x];
+
+ if (total != 0)
+ document.getElementById("console").innerHTML = "TEST PASSED";
+ else
+ document.getElementById("console").innerHTML = "TEST FAILED";
+}
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvasdrawfocusifneededhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/draw-focus-if-needed.html (0 => 173652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/draw-focus-if-needed.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/draw-focus-if-needed.html 2014-09-16 08:13:06 UTC (rev 173652)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+This test ensures that a focus ring is drawn.
+<canvas id="canvas" class="output" width="30" height="30">
+ <button id="button1"></button>
+</canvas>
+<div id="console"></div>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+var button1 = document.getElementById("button1");
+var canvas = document.getElementById("canvas").getContext("2d");
+canvas.beginPath();
+canvas.rect(10, 10, 10, 10);
+canvas.drawFocusIfNeeded(button1);
+var imagedata = canvas.getImageData(0, 0, 30, 30);
+var total = 0;
+for(var x = 0; x < 30 * 30 * 4; x++)
+ total += imagedata.data[x];
+
+if (total != 0)
+ document.getElementById("console").innerHTML = "TEST PASSED";
+else
+{
+ button1.focus();
+ canvas.drawFocusIfNeeded(button1);
+ imagedata = canvas.getImageData(0, 0, 30, 30);
+ for(var x = 0; x < 30 * 30* 4; x++)
+ total += imagedata.data[x];
+
+ if (total != 0)
+ document.getElementById("console").innerHTML = "TEST PASSED";
+ else
+ document.getElementById("console").innerHTML = "TEST FAILED";
+}
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173651 => 173652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-16 06:53:30 UTC (rev 173651)
+++ trunk/Source/WebCore/ChangeLog 2014-09-16 08:13:06 UTC (rev 173652)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-16 Jinho Bang <jinho.bang@samsung.com>
+
+ Add version of drawFocusIfNeeded that take a Path2D parameter.
+ https://bugs.webkit.org/show_bug.cgi?id=136846
+
+ Reviewed by Dirk Schulze.
+
+ Tests: fast/canvas/draw-focus-if-needed-with-path.html
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::drawFocusIfNeeded):
+ (WebCore::CanvasRenderingContext2D::drawFocusIfNeededInternal):
+ * html/canvas/CanvasRenderingContext2D.h:
+ * html/canvas/CanvasRenderingContext2D.idl:
+
</ins><span class="cx"> 2014-09-15 Iago Toral <itoral@igalia.com> and Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add WaylandDisplay
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (173651 => 173652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-09-16 06:53:30 UTC (rev 173651)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2014-09-16 08:13:06 UTC (rev 173652)
</span><span class="lines">@@ -1975,13 +1975,23 @@
</span><span class="cx">
</span><span class="cx"> void CanvasRenderingContext2D::drawFocusIfNeeded(Element* element)
</span><span class="cx"> {
</span><ins>+ drawFocusIfNeededInternal(m_path, element);
+}
+
+void CanvasRenderingContext2D::drawFocusIfNeeded(DOMPath* path, Element* element)
+{
+ drawFocusIfNeededInternal(path->path(), element);
+}
+
+void CanvasRenderingContext2D::drawFocusIfNeededInternal(const Path& path, Element* element)
+{
</ins><span class="cx"> GraphicsContext* context = drawingContext();
</span><span class="cx">
</span><del>- if (!element || !element->focused() || !state().m_hasInvertibleTransform || m_path.isEmpty()
</del><ins>+ if (!element || !element->focused() || !state().m_hasInvertibleTransform || path.isEmpty()
</ins><span class="cx"> || !element->isDescendantOf(canvas()) || !context)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- context->drawFocusRing(m_path, 1, 1, RenderTheme::focusRingColor());
</del><ins>+ context->drawFocusRing(path, 1, 1, RenderTheme::focusRingColor());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CanvasRenderingContext2D::putImageData(ImageData* data, ImageBuffer::CoordinateSystem coordinateSystem, float dx, float dy, float dirtyX, float dirtyY,
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (173651 => 173652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2014-09-16 06:53:30 UTC (rev 173651)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2014-09-16 08:13:06 UTC (rev 173652)
</span><span class="lines">@@ -198,6 +198,7 @@
</span><span class="cx"> void webkitPutImageDataHD(ImageData*, float dx, float dy, float dirtyX, float dirtyY, float dirtyWidth, float dirtyHeight, ExceptionCode&);
</span><span class="cx">
</span><span class="cx"> void drawFocusIfNeeded(Element*);
</span><ins>+ void drawFocusIfNeeded(DOMPath*, Element*);
</ins><span class="cx">
</span><span class="cx"> float webkitBackingStorePixelRatio() const { return 1; }
</span><span class="cx">
</span><span class="lines">@@ -323,6 +324,8 @@
</span><span class="cx"> bool isPointInPathInternal(const Path&, float x, float y, const String& winding);
</span><span class="cx"> bool isPointInStrokeInternal(const Path&, float x, float y);
</span><span class="cx">
</span><ins>+ void drawFocusIfNeededInternal(const Path&, Element*);
+
</ins><span class="cx"> void clearCanvas();
</span><span class="cx"> Path transformAreaToDevice(const Path&) const;
</span><span class="cx"> Path transformAreaToDevice(const FloatRect&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Didl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl (173651 => 173652)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2014-09-16 06:53:30 UTC (rev 173651)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2014-09-16 08:13:06 UTC (rev 173652)
</span><span class="lines">@@ -181,6 +181,7 @@
</span><span class="cx">
</span><span class="cx"> // Focus rings
</span><span class="cx"> void drawFocusIfNeeded(Element element);
</span><ins>+ void drawFocusIfNeeded(DOMPath path, Element element);
</ins><span class="cx">
</span><span class="cx"> readonly attribute float webkitBackingStorePixelRatio;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>