<!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>[207124] releases/WebKitGTK/webkit-2.14</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/207124">207124</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-11 06:33:06 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206591">r206591</a> - Fix hit testing on display:block <svg> elements
https://bugs.webkit.org/show_bug.cgi?id=162717
rdar://problem/23261130
Reviewed by Zalan Bujtas.
Source/WebCore:
RenderSVGRoot::nodeAtPoint() needs to test for both the HitTestBlockBackground and
HitTestChildBlockBackground phases, since we only get the HitTestChildBlockBackground
phase when the <svg> is a block. This is similar to code in RenderTable::nodeAtPoint(),
and matches Blink code.
This fixes the point dragging on http://anthonydugois.com/svg-path-builder/.
Test: svg/hittest/block-svg.html
* rendering/svg/RenderSVGRoot.cpp:
(WebCore::RenderSVGRoot::nodeAtPoint):
LayoutTests:
Test hit testing on inline and block <svg> elements.
* svg/hittest/block-svg-expected.txt: Added.
* svg/hittest/block-svg.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingsvgRenderSVGRootcpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/svg/RenderSVGRoot.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestssvghittestblocksvgexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/svg/hittest/block-svg-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestssvghittestblocksvghtml">releases/WebKitGTK/webkit-2.14/LayoutTests/svg/hittest/block-svg.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog (207123 => 207124)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-10-11 13:24:27 UTC (rev 207123)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-10-11 13:33:06 UTC (rev 207124)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-09-29 Simon Fraser <simon.fraser@apple.com>
+
+ Fix hit testing on display:block <svg> elements
+ https://bugs.webkit.org/show_bug.cgi?id=162717
+ rdar://problem/23261130
+
+ Reviewed by Zalan Bujtas.
+
+ Test hit testing on inline and block <svg> elements.
+
+ * svg/hittest/block-svg-expected.txt: Added.
+ * svg/hittest/block-svg.html: Added.
+
</ins><span class="cx"> 2016-09-27 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Toggling display: none on a parent element of a slot which shares style with its parent doesn't update the slot's visibility
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestssvghittestblocksvgexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/svg/hittest/block-svg-expected.txt (0 => 207124)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/svg/hittest/block-svg-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/svg/hittest/block-svg-expected.txt 2016-10-11 13:33:06 UTC (rev 207124)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+ PASS: element at 28, 20 is svg
+PASS: element at 28, 130 is svg
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestssvghittestblocksvghtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/svg/hittest/block-svg.html (0 => 207124)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/svg/hittest/block-svg.html (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/svg/hittest/block-svg.html 2016-10-11 13:33:06 UTC (rev 207124)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style>
+ .container {
+ height: 100px;
+ width: 200px;
+ margin: 10px;
+ }
+
+ svg {
+ background-color: silver;
+ }
+
+ svg:hover {
+ background-color: green;
+ }
+ </style>
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ function doTest()
+ {
+ var svgElements = document.getElementsByTagName('svg');
+ var result = '';
+
+ for (var i = 0; i < svgElements.length; ++i) {
+ var element = svgElements[i];
+
+ var rect = element.getBoundingClientRect();
+ var left = rect.left + 10;
+ var top = rect.top + 10;
+ var hitElement = document.elementFromPoint(left, top);
+
+ if (element === hitElement)
+ result += 'PASS: element at ' + left + ', ' + top + ' is ' + element.tagName + '\n';
+ else
+ result += 'FAIL: expected to hit ' + element.tagName + ' at ' + left + ', ' + top + ' but hit ' + hitElement.tagName + '\n';
+ }
+
+ document.getElementById('result').textContent = result;
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+<div class="container">
+ <svg width="200" height="100"></svg>
+</div>
+
+<div class="container">
+ <svg width="200" height="100" style="display: block;"></svg>
+</div>
+<pre id="result"></pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207123 => 207124)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:24:27 UTC (rev 207123)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 13:33:06 UTC (rev 207124)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-09-29 Simon Fraser <simon.fraser@apple.com>
+
+ Fix hit testing on display:block <svg> elements
+ https://bugs.webkit.org/show_bug.cgi?id=162717
+ rdar://problem/23261130
+
+ Reviewed by Zalan Bujtas.
+
+ RenderSVGRoot::nodeAtPoint() needs to test for both the HitTestBlockBackground and
+ HitTestChildBlockBackground phases, since we only get the HitTestChildBlockBackground
+ phase when the <svg> is a block. This is similar to code in RenderTable::nodeAtPoint(),
+ and matches Blink code.
+
+ This fixes the point dragging on http://anthonydugois.com/svg-path-builder/.
+
+ Test: svg/hittest/block-svg.html
+
+ * rendering/svg/RenderSVGRoot.cpp:
+ (WebCore::RenderSVGRoot::nodeAtPoint):
+
</ins><span class="cx"> 2016-10-05 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Bump Chrome version in Chrome user agent quirk
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingsvgRenderSVGRootcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (207123 => 207124)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2016-10-11 13:24:27 UTC (rev 207123)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2016-10-11 13:33:06 UTC (rev 207124)
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If we didn't early exit above, we've just hit the container <svg> element. Unlike SVG 1.1, 2nd Edition allows container elements to be hit.
</span><del>- if (hitTestAction == HitTestBlockBackground && visibleToHitTesting()) {
</del><ins>+ if ((hitTestAction == HitTestBlockBackground || hitTestAction == HitTestChildBlockBackground) && visibleToHitTesting()) {
</ins><span class="cx"> // Only return true here, if the last hit testing phase 'BlockBackground' is executed. If we'd return true in the 'Foreground' phase,
</span><span class="cx"> // hit testing would stop immediately. For SVG only trees this doesn't matter. Though when we have a <foreignObject> subtree we need
</span><span class="cx"> // to be able to detect hits on the background of a <div> element. If we'd return true here in the 'Foreground' phase, we are not able
</span></span></pre>
</div>
</div>
</body>
</html>