<!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>[201273] releases/WebKitGTK/webkit-2.12</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/201273">201273</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-23 05:17:44 -0700 (Mon, 23 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200923">r200923</a> - ToT WebKit doesn't show tooltip on perf dashboard's summary page
https://bugs.webkit.org/show_bug.cgi?id=157705
Reviewed by Darin Adler.
Source/WebCore:
The bug was caused by WebKit doesn't look for the title attribute across shadow boundaries.
Fixed it by using a newly added Node::parentNodeInComposedTree in HitTestResult::title.
Test: fast/shadow-dom/tooltip-on-composed-tree.html
* dom/Node.cpp:
(WebCore::Node::parentInComposedTree): Added.
* dom/Node.h:
* rendering/HitTestResult.cpp:
(WebCore::HitTestResult::title): Fixed the bug.
(WebCore::HitTestResult::innerTextIfTruncated): Fixed a related bug when ShowsToolTipOverTruncatedText
is enabled. Unfortunately, there is no machinery to test this feature yet.
LayoutTests:
Added a regression test for finding a tooltip across shadow boundaries.
* fast/shadow-dom/tooltip-on-composed-tree-expected.txt: Added.
* fast/shadow-dom/tooltip-on-composed-tree.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoredomNodecpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoredomNodeh">releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Node.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingHitTestResultcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/HitTestResult.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastshadowdomtooltiponcomposedtreeexpectedtxt">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/tooltip-on-composed-tree-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastshadowdomtooltiponcomposedtreehtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/tooltip-on-composed-tree.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (201272 => 201273)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-05-23 11:15:45 UTC (rev 201272)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-05-23 12:17:44 UTC (rev 201273)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-05-13 Ryosuke Niwa <rniwa@webkit.org>
+
+ ToT WebKit doesn't show tooltip on perf dashboard's summary page
+ https://bugs.webkit.org/show_bug.cgi?id=157705
+
+ Reviewed by Darin Adler.
+
+ Added a regression test for finding a tooltip across shadow boundaries.
+
+ * fast/shadow-dom/tooltip-on-composed-tree-expected.txt: Added.
+ * fast/shadow-dom/tooltip-on-composed-tree.html: Added.
+
</ins><span class="cx"> 2016-05-11 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Absolute positioned element is not placed properly when parent becomes the containing block.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastshadowdomtooltiponcomposedtreeexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/tooltip-on-composed-tree-expected.txt (0 => 201273)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/tooltip-on-composed-tree-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/tooltip-on-composed-tree-expected.txt 2016-05-23 12:17:44 UTC (rev 201273)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+This tests tooltip across shadow boundaries. To manually test, hover over two boxes below. You should see tooltips for each.
+
+PASS - Tooltip on a node inside a shadow tree with title on its shadow host ancestor
+PASS - Tooltip on a slotted node with title on its slot
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastshadowdomtooltiponcomposedtreehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/tooltip-on-composed-tree.html (0 => 201273)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/tooltip-on-composed-tree.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/shadow-dom/tooltip-on-composed-tree.html 2016-05-23 12:17:44 UTC (rev 201273)
</span><span class="lines">@@ -0,0 +1,65 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<p>This tests tooltip across shadow boundaries. To manually test, hover over two boxes below. You should see tooltips for each.</p>
+<div class="container"><a title="Tooltip"><span id="hostWithTitle"></span></a></div>
+<div class="container"><span id="hostWithSlottedContent"><span id="content">Hover over here 2</span></span></a></div>
+<style>
+
+.container {
+ border: solid 1px blue;
+ width: 100px;
+ height: 100px;
+ position: relative;
+ margin-bottom: 10px;
+}
+
+#content {
+ position: absolute;
+ left: 0px;
+ top: 0px;
+ width: 100px;
+ height: 100px;
+ background: #eee;
+}
+
+</style>
+<pre><script>
+
+var hostWithTitle = document.getElementById('hostWithTitle');
+var shadowRoot = hostWithTitle.attachShadow({mode: 'closed'});
+shadowRoot.innerHTML = `
+ <style>
+ #content {
+ position: absolute;
+ left: 0px;
+ top: 0px;
+ width: 100px;
+ height: 100px;
+ background: #eee;
+ }
+ </style>
+ <div id="content">Hover over here 1</div>
+`;
+
+var nodeInsideShadowRoot = shadowRoot.querySelector('#content');
+var slottedNode = document.querySelector('#content');
+
+shadowRootWithSlot = document.getElementById('hostWithSlottedContent').attachShadow({mode: 'closed'});
+shadowRootWithSlot.innerHTML = `<slot title="Tooltip"></slot>`;
+
+if (window.internals) {
+ testRunner.dumpAsText();
+
+ document.write((internals.toolTipFromElement(nodeInsideShadowRoot) == 'Tooltip' ? 'PASS' : 'FAIL')
+ + ' - Tooltip on a node inside a shadow tree with title on its shadow host ancestor\n');
+
+ document.write((internals.toolTipFromElement(slottedNode) == 'Tooltip' ? 'PASS' : 'FAIL')
+ + ' - Tooltip on a slotted node with title on its slot\n');
+
+ Array.from(document.querySelectorAll('.container')).map(function (node) { node.remove(); });
+}
+
+</script></pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (201272 => 201273)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-23 11:15:45 UTC (rev 201272)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-23 12:17:44 UTC (rev 201273)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-05-13 Ryosuke Niwa <rniwa@webkit.org>
+
+ ToT WebKit doesn't show tooltip on perf dashboard's summary page
+ https://bugs.webkit.org/show_bug.cgi?id=157705
+
+ Reviewed by Darin Adler.
+
+ The bug was caused by WebKit doesn't look for the title attribute across shadow boundaries.
+ Fixed it by using a newly added Node::parentNodeInComposedTree in HitTestResult::title.
+
+ Test: fast/shadow-dom/tooltip-on-composed-tree.html
+
+ * dom/Node.cpp:
+ (WebCore::Node::parentInComposedTree): Added.
+ * dom/Node.h:
+ * rendering/HitTestResult.cpp:
+ (WebCore::HitTestResult::title): Fixed the bug.
+ (WebCore::HitTestResult::innerTextIfTruncated): Fixed a related bug when ShowsToolTipOverTruncatedText
+ is enabled. Unfortunately, there is no machinery to test this feature yet.
+
</ins><span class="cx"> 2016-05-12 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> VideoSinkGStreamer: plug a GstBuffer leak in webkitVideoSinkRequestRender()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Node.cpp (201272 => 201273)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Node.cpp 2016-05-23 11:15:45 UTC (rev 201272)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Node.cpp 2016-05-23 12:17:44 UTC (rev 201273)
</span><span class="lines">@@ -1118,6 +1118,22 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ContainerNode* Node::parentInComposedTree() const
+{
+ ASSERT(isMainThreadOrGCThread());
+#if ENABLE(SHADOW_DOM) || ENABLE(DETAILS_ELEMENT)
+ if (auto* parent = parentElement()) {
+ if (auto* shadowRoot = parent->shadowRoot()) {
+ if (auto* assignedSlot = shadowRoot->findAssignedSlot(*this))
+ return assignedSlot;
+ }
+ }
+#endif
+ if (is<ShadowRoot>(*this))
+ return downcast<ShadowRoot>(*this).host();
+ return parentNode();
+}
+
</ins><span class="cx"> bool Node::isInUserAgentShadowTree() const
</span><span class="cx"> {
</span><span class="cx"> auto* shadowRoot = containingShadowRoot();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Node.h (201272 => 201273)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Node.h 2016-05-23 11:15:45 UTC (rev 201272)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/dom/Node.h 2016-05-23 12:17:44 UTC (rev 201273)
</span><span class="lines">@@ -295,6 +295,7 @@
</span><span class="cx">
</span><span class="cx"> // Node's parent or shadow tree host.
</span><span class="cx"> ContainerNode* parentOrShadowHostNode() const;
</span><ins>+ ContainerNode* parentInComposedTree() const;
</ins><span class="cx"> Element* parentOrShadowHostElement() const;
</span><span class="cx"> void setParentNode(ContainerNode*);
</span><span class="cx"> Node* highestAncestor() const;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/HitTestResult.cpp (201272 => 201273)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/HitTestResult.cpp 2016-05-23 11:15:45 UTC (rev 201272)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/HitTestResult.cpp 2016-05-23 12:17:44 UTC (rev 201273)
</span><span class="lines">@@ -246,7 +246,7 @@
</span><span class="cx"> dir = LTR;
</span><span class="cx"> // Find the title in the nearest enclosing DOM node.
</span><span class="cx"> // For <area> tags in image maps, walk the tree for the <area>, not the <img> using it.
</span><del>- for (Node* titleNode = m_innerNode.get(); titleNode; titleNode = titleNode->parentNode()) {
</del><ins>+ for (Node* titleNode = m_innerNode.get(); titleNode; titleNode = titleNode->parentInComposedTree()) {
</ins><span class="cx"> if (is<Element>(*titleNode)) {
</span><span class="cx"> Element& titleElement = downcast<Element>(*titleNode);
</span><span class="cx"> String title = titleElement.title();
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx">
</span><span class="cx"> String HitTestResult::innerTextIfTruncated(TextDirection& dir) const
</span><span class="cx"> {
</span><del>- for (Node* truncatedNode = m_innerNode.get(); truncatedNode; truncatedNode = truncatedNode->parentNode()) {
</del><ins>+ for (Node* truncatedNode = m_innerNode.get(); truncatedNode; truncatedNode = truncatedNode->parentInComposedTree()) {
</ins><span class="cx"> if (!is<Element>(*truncatedNode))
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>