<!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>[187686] trunk/Source/WebCore</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/187686">187686</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-07-31 15:34:23 -0700 (Fri, 31 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] DOMNode preview snapshot rects are wrong for user-select: none links
https://bugs.webkit.org/show_bug.cgi?id=147513
<rdar://problem/22083354>
Reviewed by Simon Fraser.
* bindings/objc/DOM.mm:
(-[DOMNode getPreviewSnapshotImage:andRects:]):
Use the same code as WebKit2 to compute the fallback rect (if TextIndicator fails),
asking the RenderObject (or RenderImage) for its bounding box instead of using the
(often wrong) Range bounding rect.
Make sure to use the fallback rect *any* time TextIndicator fails (before
we would return no rects at all if TextIndicator::createWithRange returned null,
and the fallback rect if it returned with an empty image).
Inverse-page-scale the margin, to match the appearance in WebKit2.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcDOMmm">trunk/Source/WebCore/bindings/objc/DOM.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187685 => 187686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-31 22:24:56 UTC (rev 187685)
+++ trunk/Source/WebCore/ChangeLog 2015-07-31 22:34:23 UTC (rev 187686)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-07-31 Tim Horton <timothy_horton@apple.com>
+
+ [iOS] DOMNode preview snapshot rects are wrong for user-select: none links
+ https://bugs.webkit.org/show_bug.cgi?id=147513
+ <rdar://problem/22083354>
+
+ Reviewed by Simon Fraser.
+
+ * bindings/objc/DOM.mm:
+ (-[DOMNode getPreviewSnapshotImage:andRects:]):
+ Use the same code as WebKit2 to compute the fallback rect (if TextIndicator fails),
+ asking the RenderObject (or RenderImage) for its bounding box instead of using the
+ (often wrong) Range bounding rect.
+
+ Make sure to use the fallback rect *any* time TextIndicator fails (before
+ we would return no rects at all if TextIndicator::createWithRange returned null,
+ and the fallback rect if it returned with an empty image).
+
+ Inverse-page-scale the margin, to match the appearance in WebKit2.
+
</ins><span class="cx"> 2015-07-31 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [SVG -> OTF Converter] Crash when converting Arabic fonts
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcDOMmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/DOM.mm (187685 => 187686)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/objc/DOM.mm 2015-07-31 22:24:56 UTC (rev 187685)
+++ trunk/Source/WebCore/bindings/objc/DOM.mm 2015-07-31 22:34:23 UTC (rev 187686)
</span><span class="lines">@@ -595,28 +595,39 @@
</span><span class="cx">
</span><span class="cx"> Ref<Range> range = rangeOfContents(*coreNode);
</span><span class="cx">
</span><del>- const float margin = 4;
</del><ins>+ const float margin = 4 / coreNode->document().page()->pageScaleFactor();
</ins><span class="cx"> RefPtr<TextIndicator> textIndicator = TextIndicator::createWithRange(range, TextIndicatorPresentationTransition::None, margin);
</span><span class="cx">
</span><del>- if (!textIndicator)
- return;
</del><ins>+ if (textIndicator) {
+ if (Image* image = textIndicator->contentImage())
+ *cgImage = (CGImageRef)CFAutorelease(CGImageRetain(image->getCGImageRef()));
+ }
</ins><span class="cx">
</span><del>- if (Image* image = textIndicator->contentImage())
- *cgImage = (CGImageRef)CFAutorelease(CGImageRetain(image->getCGImageRef()));
-
</del><span class="cx"> RetainPtr<NSMutableArray> rectArray = adoptNS([[NSMutableArray alloc] init]);
</span><span class="cx">
</span><del>- if (*cgImage) {
- FloatPoint origin = textIndicator->textBoundingRectInRootViewCoordinates().location();
- for (const FloatRect& rect : textIndicator->textRectsInBoundingRectCoordinates()) {
- CGRect cgRect = rect;
- cgRect.origin.x += origin.x();
- cgRect.origin.y += origin.y();
- cgRect = coreNode->document().frame()->view()->contentsToWindow(enclosingIntRect(cgRect));
</del><ins>+ if (!*cgImage) {
+ if (RenderObject* renderer = coreNode->renderer()) {
+ FloatRect boundingBox;
+ if (renderer->isRenderImage())
+ boundingBox = downcast<RenderImage>(*renderer).absoluteContentQuad().enclosingBoundingBox();
+ else
+ boundingBox = renderer->absoluteBoundingBoxRect();
+
+ boundingBox.inflate(margin);
+
+ CGRect cgRect = coreNode->document().frame()->view()->contentsToWindow(enclosingIntRect(boundingBox));
</ins><span class="cx"> [rectArray addObject:[NSValue value:&cgRect withObjCType:@encode(CGRect)]];
</span><ins>+
+ *rects = rectArray.autorelease();
</ins><span class="cx"> }
</span><del>- } else {
- CGRect cgRect = CGRectInset(range->boundingRect(), -margin, -margin);
</del><ins>+ return;
+ }
+
+ FloatPoint origin = textIndicator->textBoundingRectInRootViewCoordinates().location();
+ for (const FloatRect& rect : textIndicator->textRectsInBoundingRectCoordinates()) {
+ CGRect cgRect = rect;
+ cgRect.origin.x += origin.x();
+ cgRect.origin.y += origin.y();
</ins><span class="cx"> cgRect = coreNode->document().frame()->view()->contentsToWindow(enclosingIntRect(cgRect));
</span><span class="cx"> [rectArray addObject:[NSValue value:&cgRect withObjCType:@encode(CGRect)]];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>