<!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>[208000] 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/208000">208000</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-10-27 13:08:51 -0700 (Thu, 27 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Element parameter to CanvasRenderingContext2D.drawFocusIfNeeded() should not be nullable
https://bugs.webkit.org/show_bug.cgi?id=164062
Reviewed by Darin Adler.
Source/WebCore:
Element parameter to CanvasRenderingContext2D.drawFocusIfNeeded() should not be nullable:
- https://html.spec.whatwg.org/#canvasuserinterface
Firefox and Chrome agree with the specification.
Test: fast/canvas/draw-focus-if-needed-null-element.html
* html/canvas/CanvasRenderingContext2D.cpp:
(WebCore::CanvasRenderingContext2D::drawFocusIfNeeded):
(WebCore::CanvasRenderingContext2D::drawFocusIfNeededInternal):
* html/canvas/CanvasRenderingContext2D.h:
* html/canvas/CanvasRenderingContext2D.idl:
LayoutTests:
Add layout test coverage.
* fast/canvas/draw-focus-if-needed-null-element-expected.txt: Added.
* fast/canvas/draw-focus-if-needed-null-element.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="#trunkLayoutTestsfastcanvasdrawfocusifneedednullelementexpectedtxt">trunk/LayoutTests/fast/canvas/draw-focus-if-needed-null-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcanvasdrawfocusifneedednullelementhtml">trunk/LayoutTests/fast/canvas/draw-focus-if-needed-null-element.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207999 => 208000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-27 20:00:38 UTC (rev 207999)
+++ trunk/LayoutTests/ChangeLog 2016-10-27 20:08:51 UTC (rev 208000)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2016-10-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Element parameter to CanvasRenderingContext2D.drawFocusIfNeeded() should not be nullable
+ https://bugs.webkit.org/show_bug.cgi?id=164062
+
+ Reviewed by Darin Adler.
+
+ Add layout test coverage.
+
+ * fast/canvas/draw-focus-if-needed-null-element-expected.txt: Added.
+ * fast/canvas/draw-focus-if-needed-null-element.html: Added.
+
+2016-10-27 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> testharnessreport.js should sanitize the results before printing them
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164064
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfastcanvasdrawfocusifneedednullelementexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/draw-focus-if-needed-null-element-expected.txt (0 => 208000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/draw-focus-if-needed-null-element-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/canvas/draw-focus-if-needed-null-element-expected.txt 2016-10-27 20:08:51 UTC (rev 208000)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+Tests that the element parameter to drawFocusIfNeeded() is non-nullable.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS canvas.drawFocusIfNeeded(null) threw exception TypeError: Argument 1 ('element') to CanvasRenderingContext2D.drawFocusIfNeeded must be an instance of Element.
+PASS canvas.drawFocusIfNeeded(path, null) threw exception TypeError: Argument 2 ('element') to CanvasRenderingContext2D.drawFocusIfNeeded must be an instance of Element.
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcanvasdrawfocusifneedednullelementhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/canvas/draw-focus-if-needed-null-element.html (0 => 208000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/canvas/draw-focus-if-needed-null-element.html (rev 0)
+++ trunk/LayoutTests/fast/canvas/draw-focus-if-needed-null-element.html 2016-10-27 20:08:51 UTC (rev 208000)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<canvas id="canvas" width="30" height="30"></canvas>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+description("Tests that the element parameter to drawFocusIfNeeded() is non-nullable.");
+
+var canvas = document.getElementById("canvas").getContext("2d");
+shouldThrowErrorName("canvas.drawFocusIfNeeded(null)", "TypeError");
+
+var path = new Path2D();
+path.rect(10, 10, 10, 10);
+shouldThrowErrorName("canvas.drawFocusIfNeeded(path, null)", "TypeError");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207999 => 208000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-27 20:00:38 UTC (rev 207999)
+++ trunk/Source/WebCore/ChangeLog 2016-10-27 20:08:51 UTC (rev 208000)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-10-27 Chris Dumez <cdumez@apple.com>
+
+ Element parameter to CanvasRenderingContext2D.drawFocusIfNeeded() should not be nullable
+ https://bugs.webkit.org/show_bug.cgi?id=164062
+
+ Reviewed by Darin Adler.
+
+ Element parameter to CanvasRenderingContext2D.drawFocusIfNeeded() should not be nullable:
+ - https://html.spec.whatwg.org/#canvasuserinterface
+
+ Firefox and Chrome agree with the specification.
+
+ Test: fast/canvas/draw-focus-if-needed-null-element.html
+
+ * html/canvas/CanvasRenderingContext2D.cpp:
+ (WebCore::CanvasRenderingContext2D::drawFocusIfNeeded):
+ (WebCore::CanvasRenderingContext2D::drawFocusIfNeededInternal):
+ * html/canvas/CanvasRenderingContext2D.h:
+ * html/canvas/CanvasRenderingContext2D.idl:
+
</ins><span class="cx"> 2016-10-27 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [DOMJIT][CSSJIT] Share code with DOMJIT
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (207999 => 208000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2016-10-27 20:00:38 UTC (rev 207999)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2016-10-27 20:08:51 UTC (rev 208000)
</span><span class="lines">@@ -2041,21 +2041,21 @@
</span><span class="cx"> putImageData(data, ImageBuffer::BackingStoreCoordinateSystem, dx, dy, dirtyX, dirtyY, dirtyWidth, dirtyHeight);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::drawFocusIfNeeded(Element* element)
</del><ins>+void CanvasRenderingContext2D::drawFocusIfNeeded(Element& element)
</ins><span class="cx"> {
</span><span class="cx"> drawFocusIfNeededInternal(m_path, element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::drawFocusIfNeeded(DOMPath& path, Element* element)
</del><ins>+void CanvasRenderingContext2D::drawFocusIfNeeded(DOMPath& path, Element& element)
</ins><span class="cx"> {
</span><span class="cx"> drawFocusIfNeededInternal(path.path(), element);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void CanvasRenderingContext2D::drawFocusIfNeededInternal(const Path& path, Element* element)
</del><ins>+void CanvasRenderingContext2D::drawFocusIfNeededInternal(const Path& path, Element& element)
</ins><span class="cx"> {
</span><span class="cx"> GraphicsContext* context = drawingContext();
</span><span class="cx">
</span><del>- if (!element || !element->focused() || !state().hasInvertibleTransform || path.isEmpty() || !element->isDescendantOf(canvas()) || !context)
</del><ins>+ if (!element.focused() || !state().hasInvertibleTransform || path.isEmpty() || !element.isDescendantOf(canvas()) || !context)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> context->drawFocusRing(path, 1, 1, RenderTheme::focusRingColor());
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Dh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h (207999 => 208000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2016-10-27 20:00:38 UTC (rev 207999)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.h 2016-10-27 20:08:51 UTC (rev 208000)
</span><span class="lines">@@ -197,8 +197,8 @@
</span><span class="cx"> void webkitPutImageDataHD(ImageData&, float dx, float dy);
</span><span class="cx"> void webkitPutImageDataHD(ImageData&, float dx, float dy, float dirtyX, float dirtyY, float dirtyWidth, float dirtyHeight);
</span><span class="cx">
</span><del>- void drawFocusIfNeeded(Element*);
- void drawFocusIfNeeded(DOMPath&, Element*);
</del><ins>+ void drawFocusIfNeeded(Element&);
+ 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">@@ -353,7 +353,7 @@
</span><span class="cx"> bool isPointInPathInternal(const Path&, float x, float y, WindingRule);
</span><span class="cx"> bool isPointInStrokeInternal(const Path&, float x, float y);
</span><span class="cx">
</span><del>- void drawFocusIfNeededInternal(const Path&, Element*);
</del><ins>+ void drawFocusIfNeededInternal(const Path&, Element&);
</ins><span class="cx">
</span><span class="cx"> void clearCanvas();
</span><span class="cx"> Path transformAreaToDevice(const Path&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlcanvasCanvasRenderingContext2Didl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl (207999 => 208000)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2016-10-27 20:00:38 UTC (rev 207999)
+++ trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.idl 2016-10-27 20:08:51 UTC (rev 208000)
</span><span class="lines">@@ -176,8 +176,8 @@
</span><span class="cx"> [MayThrowException] ImageData webkitGetImageDataHD(float sx, float sy, float sw, float sh);
</span><span class="cx">
</span><span class="cx"> // Focus rings
</span><del>- void drawFocusIfNeeded(Element? element); // FIXME: The element parameter should not be nullable.
- void drawFocusIfNeeded(DOMPath path, Element? element); // FIXME: The element parameter should not be nullable.
</del><ins>+ void drawFocusIfNeeded(Element element);
+ 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>