<!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>[168499] trunk/Source/WebKit2</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/168499">168499</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2014-05-08 15:29:22 -0700 (Thu, 08 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/168053">r168053</a>): Phone number detection boxes are wrong when scrolled
https://bugs.webkit.org/show_bug.cgi?id=132706
-and corresponding-
<rdar://problem/16787957>
Reviewed by Tim Horton.
We need to paint the boxes in Document coordinates. Range::boundingRect() was
giving us a point that took scroll position into account, and that’s not what we
want. Here we use Range::textQuads() instead so that we can get something in
Document coordinates, and then we need to convert that up to the main Document’s
coordinates.
* WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm:
(WebKit::textQuadsToBoundingRectForRange):
(WebKit::TelephoneNumberOverlayController::drawRect):
The telephone click function wants a point in Window coordinates.
(WebKit::TelephoneNumberOverlayController::mouseEvent):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTelephoneNumberOverlayControllerMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (168498 => 168499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-08 22:03:33 UTC (rev 168498)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-08 22:29:22 UTC (rev 168499)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-05-08 Beth Dakin <bdakin@apple.com>
+
+ REGRESSION (r168053): Phone number detection boxes are wrong when scrolled
+ https://bugs.webkit.org/show_bug.cgi?id=132706
+ -and corresponding-
+ <rdar://problem/16787957>
+
+ Reviewed by Tim Horton.
+
+ We need to paint the boxes in Document coordinates. Range::boundingRect() was
+ giving us a point that took scroll position into account, and that’s not what we
+ want. Here we use Range::textQuads() instead so that we can get something in
+ Document coordinates, and then we need to convert that up to the main Document’s
+ coordinates.
+ * WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm:
+ (WebKit::textQuadsToBoundingRectForRange):
+ (WebKit::TelephoneNumberOverlayController::drawRect):
+
+ The telephone click function wants a point in Window coordinates.
+ (WebKit::TelephoneNumberOverlayController::mouseEvent):
+
</ins><span class="cx"> 2014-05-08 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WebKit2] Flush RemoteLayerBackingStore contexts on a secondary queue
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTelephoneNumberOverlayControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm (168498 => 168499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm 2014-05-08 22:03:33 UTC (rev 168498)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm 2014-05-08 22:29:22 UTC (rev 168499)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION) && PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> #import <WebCore/Document.h>
</span><ins>+#import <WebCore/FloatQuad.h>
</ins><span class="cx"> #import <WebCore/FrameView.h>
</span><span class="cx"> #import <WebCore/GraphicsContext.h>
</span><span class="cx"> #import <WebCore/MainFrame.h>
</span><span class="lines">@@ -55,6 +56,17 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+static IntRect textQuadsToBoundingRectForRange(Range& range)
+{
+ Vector<FloatQuad> textQuads;
+ range.textQuads(textQuads);
+ FloatRect boundingRect;
+ size_t size = textQuads.size();
+ for (size_t i = 0; i < size; ++i)
+ boundingRect.unite(textQuads[i].boundingBox());
+ return enclosingIntRect(boundingRect);
+}
+
</ins><span class="cx"> void TelephoneNumberOverlayController::drawRect(PageOverlay* overlay, WebCore::GraphicsContext& graphicsContext, const WebCore::IntRect& dirtyRect)
</span><span class="cx"> {
</span><span class="cx"> if (m_currentSelectionRanges.isEmpty())
</span><span class="lines">@@ -67,14 +79,17 @@
</span><span class="cx"> for (auto& range : m_currentSelectionRanges) {
</span><span class="cx"> // FIXME: This will choke if the range wraps around the edge of the view.
</span><span class="cx"> // What should we do in that case?
</span><del>- IntRect rect = enclosingIntRect(range->boundingRect());
</del><ins>+ IntRect rect = textQuadsToBoundingRectForRange(*range);
</ins><span class="cx">
</span><span class="cx"> // Convert to the main document's coordinate space.
</span><ins>+ // FIXME: It's a little crazy to call contentsToWindow and then windowToContents in order to get the right coordinate space.
+ // We should consider adding conversion functions to ScrollView for contentsToDocument(). Right now, contentsToRootView() is
+ // not equivalent to what we need when you have a topContentInset or a header banner.
</ins><span class="cx"> FrameView* viewForRange = range->ownerDocument().view();
</span><span class="cx"> if (!viewForRange)
</span><span class="cx"> return;
</span><span class="cx"> FrameView& mainFrameView = *m_webPage->corePage()->mainFrame().view();
</span><del>- rect.setLocation(mainFrameView.convertChildToSelf(viewForRange, rect.location()));
</del><ins>+ rect.setLocation(mainFrameView.windowToContents(viewForRange->contentsToWindow(rect.location())));
</ins><span class="cx">
</span><span class="cx"> CGRect cgRects[] = { (CGRect)rect };
</span><span class="cx">
</span><span class="lines">@@ -122,7 +137,7 @@
</span><span class="cx"> bool TelephoneNumberOverlayController::mouseEvent(PageOverlay*, const WebMouseEvent& event)
</span><span class="cx"> {
</span><span class="cx"> IntPoint mousePosition = m_webPage->corePage()->mainFrame().view()->rootViewToContents(event.position());
</span><del>-
</del><ins>+
</ins><span class="cx"> // If this event has nothing to do with the left button, it clears the current mouse down tracking and we're done processing it.
</span><span class="cx"> if (event.button() != WebMouseEvent::LeftButton) {
</span><span class="cx"> clearMouseDownInformation();
</span><span class="lines">@@ -138,7 +153,7 @@
</span><span class="cx"> // If the mouse lifted while still over the highlight button that it went down on, then that is a click.
</span><span class="cx"> Boolean onButton;
</span><span class="cx"> if (DDHighlightPointIsOnHighlight(currentNumber->highlight(), (CGPoint)mousePosition, &onButton) && onButton) {
</span><del>- handleTelephoneClick(currentNumber.get(), mousePosition);
</del><ins>+ handleTelephoneClick(currentNumber.get(), m_webPage->corePage()->mainFrame().view()->contentsToWindow(mousePosition));
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>