<!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>[198578] 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/198578">198578</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-03-22 22:46:00 -0700 (Tue, 22 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Invoking a link preview on a complex link (e.g. an image) results in an empty TextIndicator
https://bugs.webkit.org/show_bug.cgi?id=155779
<rdar://problem/22408793>
Reviewed by Simon Fraser.
* page/FrameSnapshotting.cpp:
(WebCore::snapshotFrameRect):
(WebCore::snapshotFrameRectWithClip):
* page/FrameSnapshotting.h:
* page/TextIndicator.cpp:
(WebCore::takeSnapshot):
(WebCore::takeSnapshots):
(WebCore::initializeIndicator):
When snapshotting, clip to the indicated range's rects. This is important
to avoid painting into the margins in the non-selection-only painting case.
This didn't come up with normal selection-only painting because the text
didn't intersect the margin, and the background doesn't paint.
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::dictionaryPopupInfoForRange):
(WebKit::WebPage::performImmediateActionHitTestAtLocation):
Use the TextIndicator mode where we give up on selection-only snapshotting
and just paint all content on Mac, similar to what we do for 3D Touch indicators.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameSnapshottingcpp">trunk/Source/WebCore/page/FrameSnapshotting.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameSnapshottingh">trunk/Source/WebCore/page/FrameSnapshotting.h</a></li>
<li><a href="#trunkSourceWebCorepageTextIndicatorcpp">trunk/Source/WebCore/page/TextIndicator.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198577 => 198578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-23 04:29:19 UTC (rev 198577)
+++ trunk/Source/WebCore/ChangeLog 2016-03-23 05:46:00 UTC (rev 198578)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-03-22 Tim Horton <timothy_horton@apple.com>
+
+ Invoking a link preview on a complex link (e.g. an image) results in an empty TextIndicator
+ https://bugs.webkit.org/show_bug.cgi?id=155779
+ <rdar://problem/22408793>
+
+ Reviewed by Simon Fraser.
+
+ * page/FrameSnapshotting.cpp:
+ (WebCore::snapshotFrameRect):
+ (WebCore::snapshotFrameRectWithClip):
+ * page/FrameSnapshotting.h:
+ * page/TextIndicator.cpp:
+ (WebCore::takeSnapshot):
+ (WebCore::takeSnapshots):
+ (WebCore::initializeIndicator):
+ When snapshotting, clip to the indicated range's rects. This is important
+ to avoid painting into the margins in the non-selection-only painting case.
+ This didn't come up with normal selection-only painting because the text
+ didn't intersect the margin, and the background doesn't paint.
+
</ins><span class="cx"> 2016-03-22 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> showModalDialog code runs with "first window" set to wrong window
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameSnapshottingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameSnapshotting.cpp (198577 => 198578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameSnapshotting.cpp 2016-03-23 04:29:19 UTC (rev 198577)
+++ trunk/Source/WebCore/page/FrameSnapshotting.cpp 2016-03-23 05:46:00 UTC (rev 198578)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "FrameSnapshotting.h"
</span><span class="cx">
</span><span class="cx"> #include "Document.h"
</span><ins>+#include "FloatRect.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameSelection.h"
</span><span class="cx"> #include "FrameView.h"
</span><span class="lines">@@ -68,6 +69,12 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<ImageBuffer> snapshotFrameRect(Frame& frame, const IntRect& imageRect, SnapshotOptions options)
</span><span class="cx"> {
</span><ins>+ Vector<FloatRect> clipRects;
+ return snapshotFrameRectWithClip(frame, imageRect, clipRects, options);
+}
+
+std::unique_ptr<ImageBuffer> snapshotFrameRectWithClip(Frame& frame, const IntRect& imageRect, Vector<FloatRect>& clipRects, SnapshotOptions options)
+{
</ins><span class="cx"> if (!frame.page())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="lines">@@ -104,6 +111,13 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> buffer->context().translate(-imageRect.x(), -imageRect.y());
</span><span class="cx">
</span><ins>+ if (!clipRects.isEmpty()) {
+ Path clipPath;
+ for (auto& rect : clipRects)
+ clipPath.addRect(rect);
+ buffer->context().clipPath(clipPath);
+ }
+
</ins><span class="cx"> frame.view()->paintContentsForSnapshot(buffer->context(), imageRect, shouldIncludeSelection, coordinateSpace);
</span><span class="cx"> return buffer;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameSnapshottingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameSnapshotting.h (198577 => 198578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameSnapshotting.h 2016-03-23 04:29:19 UTC (rev 198577)
+++ trunk/Source/WebCore/page/FrameSnapshotting.h 2016-03-23 05:46:00 UTC (rev 198578)
</span><span class="lines">@@ -31,9 +31,11 @@
</span><span class="cx"> #define FrameSnapshotting_h
</span><span class="cx">
</span><span class="cx"> #include <memory>
</span><ins>+#include <wtf/Vector.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class FloatRect;
</ins><span class="cx"> class Frame;
</span><span class="cx"> class IntRect;
</span><span class="cx"> class ImageBuffer;
</span><span class="lines">@@ -50,6 +52,7 @@
</span><span class="cx"> typedef unsigned SnapshotOptions;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT std::unique_ptr<ImageBuffer> snapshotFrameRect(Frame&, const IntRect&, SnapshotOptions = SnapshotOptionsNone);
</span><ins>+std::unique_ptr<ImageBuffer> snapshotFrameRectWithClip(Frame&, const IntRect&, Vector<FloatRect>& clipRects, SnapshotOptions = SnapshotOptionsNone);
</ins><span class="cx"> std::unique_ptr<ImageBuffer> snapshotNode(Frame&, Node&);
</span><span class="cx"> WEBCORE_EXPORT std::unique_ptr<ImageBuffer> snapshotSelection(Frame&, SnapshotOptions = SnapshotOptionsNone);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageTextIndicatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/TextIndicator.cpp (198577 => 198578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/TextIndicator.cpp 2016-03-23 04:29:19 UTC (rev 198577)
+++ trunk/Source/WebCore/page/TextIndicator.cpp 2016-03-23 05:46:00 UTC (rev 198578)
</span><span class="lines">@@ -149,26 +149,26 @@
</span><span class="cx"> return snapshotOptions;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<Image> takeSnapshot(Frame& frame, IntRect rect, SnapshotOptions options, float& scaleFactor)
</del><ins>+static RefPtr<Image> takeSnapshot(Frame& frame, IntRect rect, SnapshotOptions options, float& scaleFactor, Vector<FloatRect>& clipRectsInDocumentCoordinates)
</ins><span class="cx"> {
</span><del>- std::unique_ptr<ImageBuffer> buffer = snapshotFrameRect(frame, rect, options);
</del><ins>+ std::unique_ptr<ImageBuffer> buffer = snapshotFrameRectWithClip(frame, rect, clipRectsInDocumentCoordinates, options);
</ins><span class="cx"> if (!buffer)
</span><span class="cx"> return nullptr;
</span><span class="cx"> scaleFactor = buffer->resolutionScale();
</span><span class="cx"> return ImageBuffer::sinkIntoImage(WTFMove(buffer), Unscaled);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool takeSnapshots(TextIndicatorData& data, Frame& frame, IntRect snapshotRect)
</del><ins>+static bool takeSnapshots(TextIndicatorData& data, Frame& frame, IntRect snapshotRect, Vector<FloatRect>& clipRectsInDocumentCoordinates)
</ins><span class="cx"> {
</span><span class="cx"> SnapshotOptions snapshotOptions = snapshotOptionsForTextIndicatorOptions(data.options);
</span><span class="cx">
</span><del>- data.contentImage = takeSnapshot(frame, snapshotRect, snapshotOptions, data.contentImageScaleFactor);
</del><ins>+ data.contentImage = takeSnapshot(frame, snapshotRect, snapshotOptions, data.contentImageScaleFactor, clipRectsInDocumentCoordinates);
</ins><span class="cx"> if (!data.contentImage)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (data.options & TextIndicatorOptionIncludeSnapshotWithSelectionHighlight) {
</span><span class="cx"> float snapshotScaleFactor;
</span><del>- data.contentImageWithHighlight = takeSnapshot(frame, snapshotRect, SnapshotOptionsNone, snapshotScaleFactor);
</del><ins>+ data.contentImageWithHighlight = takeSnapshot(frame, snapshotRect, SnapshotOptionsNone, snapshotScaleFactor, clipRectsInDocumentCoordinates);
</ins><span class="cx"> ASSERT(!data.contentImageWithHighlight || data.contentImageScaleFactor == snapshotScaleFactor);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> data.textBoundingRectInRootViewCoordinates = textBoundingRectInRootViewCoordinates;
</span><span class="cx"> data.textRectsInBoundingRectCoordinates = textRectsInBoundingRectCoordinates;
</span><span class="cx">
</span><del>- return takeSnapshots(data, frame, enclosingIntRect(textBoundingRectInDocumentCoordinates));
</del><ins>+ return takeSnapshots(data, frame, enclosingIntRect(textBoundingRectInDocumentCoordinates), textRects);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198577 => 198578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-23 04:29:19 UTC (rev 198577)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-23 05:46:00 UTC (rev 198578)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-03-22 Tim Horton <timothy_horton@apple.com>
+
+ Invoking a link preview on a complex link (e.g. an image) results in an empty TextIndicator
+ https://bugs.webkit.org/show_bug.cgi?id=155779
+ <rdar://problem/22408793>
+
+ Reviewed by Simon Fraser.
+
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::dictionaryPopupInfoForRange):
+ (WebKit::WebPage::performImmediateActionHitTestAtLocation):
+ Use the TextIndicator mode where we give up on selection-only snapshotting
+ and just paint all content on Mac, similar to what we do for 3D Touch indicators.
+
</ins><span class="cx"> 2016-03-22 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix HTTPS on Mac using NSURLSession after r198457
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (198577 => 198578)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2016-03-23 04:29:19 UTC (rev 198577)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2016-03-23 05:46:00 UTC (rev 198578)
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx"> [scaledNSAttributedString addAttributes:scaledAttributes.get() range:range];
</span><span class="cx"> }];
</span><span class="cx">
</span><del>- TextIndicatorOptions indicatorOptions = TextIndicatorOptionDefault;
</del><ins>+ TextIndicatorOptions indicatorOptions = TextIndicatorOptionUseBoundingRectAndPaintAllContentForComplexRanges;
</ins><span class="cx"> if (presentationTransition == TextIndicatorPresentationTransition::BounceAndCrossfade)
</span><span class="cx"> indicatorOptions |= TextIndicatorOptionIncludeSnapshotWithSelectionHighlight;
</span><span class="cx">
</span><span class="lines">@@ -969,7 +969,7 @@
</span><span class="cx"> Element *URLElement = hitTestResult.URLElement();
</span><span class="cx"> if (!absoluteLinkURL.isEmpty() && URLElement) {
</span><span class="cx"> RefPtr<Range> linkRange = rangeOfContents(*URLElement);
</span><del>- immediateActionResult.linkTextIndicator = TextIndicator::createWithRange(*linkRange, TextIndicatorOptionDefault, TextIndicatorPresentationTransition::FadeIn);
</del><ins>+ immediateActionResult.linkTextIndicator = TextIndicator::createWithRange(*linkRange, TextIndicatorOptionUseBoundingRectAndPaintAllContentForComplexRanges, TextIndicatorPresentationTransition::FadeIn);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSDictionary *options = nil;
</span><span class="lines">@@ -1005,7 +1005,7 @@
</span><span class="cx"> detectedDataBoundingBox.unite(frameView->contentsToWindow(quad.enclosingBoundingBox()));
</span><span class="cx">
</span><span class="cx"> immediateActionResult.detectedDataBoundingBox = detectedDataBoundingBox;
</span><del>- immediateActionResult.detectedDataTextIndicator = TextIndicator::createWithRange(*mainResultRange, TextIndicatorOptionDefault, TextIndicatorPresentationTransition::FadeIn);
</del><ins>+ immediateActionResult.detectedDataTextIndicator = TextIndicator::createWithRange(*mainResultRange, TextIndicatorOptionUseBoundingRectAndPaintAllContentForComplexRanges, TextIndicatorPresentationTransition::FadeIn);
</ins><span class="cx"> immediateActionResult.detectedDataOriginatingPageOverlay = overlay->pageOverlayID();
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="lines">@@ -1018,7 +1018,7 @@
</span><span class="cx"> immediateActionResult.detectedDataActionContext = DataDetection::detectItemAroundHitTestResult(hitTestResult, detectedDataBoundingBox, detectedDataRange);
</span><span class="cx"> if (immediateActionResult.detectedDataActionContext && detectedDataRange) {
</span><span class="cx"> immediateActionResult.detectedDataBoundingBox = detectedDataBoundingBox;
</span><del>- immediateActionResult.detectedDataTextIndicator = TextIndicator::createWithRange(*detectedDataRange, TextIndicatorOptionDefault, TextIndicatorPresentationTransition::FadeIn);
</del><ins>+ immediateActionResult.detectedDataTextIndicator = TextIndicator::createWithRange(*detectedDataRange, TextIndicatorOptionUseBoundingRectAndPaintAllContentForComplexRanges, TextIndicatorPresentationTransition::FadeIn);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>