<!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>[186132] trunk/Source</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/186132">186132</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2015-06-30 14:40:01 -0700 (Tue, 30 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>The bounds on InteractionInformationAtPosition should be more precise
https://bugs.webkit.org/show_bug.cgi?id=146468
-and corresponding-
rdar://problem/20739834
Reviewed by Enrica Casucci and Simon Fraser.
Source/WebCore:
Export absoluteContentQuad().
* rendering/RenderBox.h:
Source/WebKit2:
For links, get the TextQuads from the Range, and for images, look at the
absoluteContentQuad(). All other items can continue to use absoluteBoundingBox.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::getPositionInformation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186131 => 186132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-30 21:37:57 UTC (rev 186131)
+++ trunk/Source/WebCore/ChangeLog 2015-06-30 21:40:01 UTC (rev 186132)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-30 Beth Dakin <bdakin@apple.com>
+
+ The bounds on InteractionInformationAtPosition should be more precise
+ https://bugs.webkit.org/show_bug.cgi?id=146468
+ -and corresponding-
+ rdar://problem/20739834
+
+ Reviewed by Enrica Casucci and Simon Fraser.
+
+ Export absoluteContentQuad().
+ * rendering/RenderBox.h:
+
</ins><span class="cx"> 2015-06-30 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Addressing post-review comments in r185756.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (186131 => 186132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2015-06-30 21:37:57 UTC (rev 186131)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2015-06-30 21:40:01 UTC (rev 186132)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> // The content box in absolute coords. Ignores transforms.
</span><span class="cx"> IntRect absoluteContentBox() const;
</span><span class="cx"> // The content box converted to absolute coords (taking transforms into account).
</span><del>- FloatQuad absoluteContentQuad() const;
</del><ins>+ WEBCORE_EXPORT FloatQuad absoluteContentQuad() const;
</ins><span class="cx">
</span><span class="cx"> // This returns the content area of the box (excluding padding and border). The only difference with contentBoxRect is that computedCSSContentBoxRect
</span><span class="cx"> // does include the intrinsic padding in the content box as this is what some callers expect (like getComputedStyle).
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186131 => 186132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-30 21:37:57 UTC (rev 186131)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-30 21:40:01 UTC (rev 186132)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-30 Beth Dakin <bdakin@apple.com>
+
+ The bounds on InteractionInformationAtPosition should be more precise
+ https://bugs.webkit.org/show_bug.cgi?id=146468
+ -and corresponding-
+ rdar://problem/20739834
+
+ Reviewed by Enrica Casucci and Simon Fraser.
+
+ For links, get the TextQuads from the Range, and for images, look at the
+ absoluteContentQuad(). All other items can continue to use absoluteBoundingBox.
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::getPositionInformation):
+
</ins><span class="cx"> 2015-06-30 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable Spintracer when getting the list of plug-ins
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (186131 => 186132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-06-30 21:37:57 UTC (rev 186131)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-06-30 21:40:01 UTC (rev 186132)
</span><span class="lines">@@ -2160,9 +2160,23 @@
</span><span class="cx"> info.title = element->fastGetAttribute(HTMLNames::titleAttr).string();
</span><span class="cx"> if (linkElement && info.title.isEmpty())
</span><span class="cx"> info.title = element->innerText();
</span><del>- if (element->renderer()) {
- info.bounds = element->renderer()->absoluteBoundingBoxRect(true);
</del><ins>+ if (element->renderer())
</ins><span class="cx"> info.touchCalloutEnabled = element->renderer()->style().touchCalloutEnabled();
</span><ins>+
+ if (element == linkElement) {
+ RefPtr<Range> linkRange = rangeOfContents(*linkElement);
+ Vector<FloatQuad> quads;
+ linkRange->textQuads(quads);
+ FloatRect linkBoundingBox;
+ for (const auto& quad : quads)
+ linkBoundingBox.unite(quad.enclosingBoundingBox());
+ info.bounds = IntRect(linkBoundingBox);
+ } else if (RenderElement* renderer = element->renderer()) {
+ if (renderer->isRenderImage()) {
+ auto& renderImage = downcast<RenderImage>(*renderer);
+ info.bounds = renderImage.absoluteContentQuad().enclosingBoundingBox();
+ } else
+ info.bounds = renderer->absoluteBoundingBoxRect();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>