<!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>[168551] 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/168551">168551</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-05-09 13:57:57 -0700 (Fri, 09 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>{TelephoneNumber, Selection}ControllerMac implementations dosn't handle tiled drawing properly.
https://bugs.webkit.org/show_bug.cgi?id=132746
<rdar://problem/16789588>
Reviewed by Tim Horton.
Don't try to draw the detector UI if no part of the selection bounds are inside
the current tile. Don't limit the detector UI to the bounds of this tile, or else
it will attempt to squeeze itself into the possibly small space available. Let it
draw as if it had the whole screen, and rely on the context clip region to
avoid overdrawing.
* WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm:
(WebKit::TelephoneNumberOverlayController::drawRect): Correct tiled drawing behavior.
* WebProcess/WebPage/mac/SelectionOverlayControllerMac.mm:
(WebKit::SelectionOverlayController::drawRect): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacSelectionOverlayControllerMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/SelectionOverlayControllerMac.mm</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 (168550 => 168551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-09 20:48:21 UTC (rev 168550)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-09 20:57:57 UTC (rev 168551)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-09 Brent Fulgham <bfulgham@apple.com>
+
+ {TelephoneNumber, Selection}ControllerMac implementations dosn't handle tiled drawing properly.
+ https://bugs.webkit.org/show_bug.cgi?id=132746
+ <rdar://problem/16789588>
+
+ Reviewed by Tim Horton.
+
+ Don't try to draw the detector UI if no part of the selection bounds are inside
+ the current tile. Don't limit the detector UI to the bounds of this tile, or else
+ it will attempt to squeeze itself into the possibly small space available. Let it
+ draw as if it had the whole screen, and rely on the context clip region to
+ avoid overdrawing.
+
+ * WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm:
+ (WebKit::TelephoneNumberOverlayController::drawRect): Correct tiled drawing behavior.
+ * WebProcess/WebPage/mac/SelectionOverlayControllerMac.mm:
+ (WebKit::SelectionOverlayController::drawRect): Ditto.
+
</ins><span class="cx"> 2014-05-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Production build fix.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacSelectionOverlayControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/SelectionOverlayControllerMac.mm (168550 => 168551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/SelectionOverlayControllerMac.mm 2014-05-09 20:48:21 UTC (rev 168550)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/SelectionOverlayControllerMac.mm 2014-05-09 20:57:57 UTC (rev 168551)
</span><span class="lines">@@ -71,16 +71,25 @@
</span><span class="cx"> Vector<CGRect> cgRects;
</span><span class="cx"> cgRects.reserveCapacity(m_currentSelectionRects.size());
</span><span class="cx">
</span><del>- for (auto& rect : m_currentSelectionRects)
</del><ins>+ for (auto& rect : m_currentSelectionRects) {
+ IntRect selectionRect(rect.pixelSnappedLocation(), rect.pixelSnappedSize());
+
+ if (!selectionRect.intersects(dirtyRect))
+ continue;
+
</ins><span class="cx"> cgRects.append((CGRect)pixelSnappedIntRect(rect));
</span><ins>+ }
</ins><span class="cx">
</span><del>- m_currentHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRect(nullptr, cgRects.begin(), cgRects.size(), (CGRect)dirtyRect, true));
- m_currentHighlightIsDirty = false;
</del><ins>+ if (!cgRects.isEmpty()) {
+ CGRect bounds = m_webPage->corePage()->mainFrame().view()->boundsRect();
+ m_currentHighlight = adoptCF(DDHighlightCreateWithRectsInVisibleRect(nullptr, cgRects.begin(), cgRects.size(), bounds, true));
+ m_currentHighlightIsDirty = false;
</ins><span class="cx">
</span><del>- Boolean onButton;
- m_mouseIsOverHighlight = DDHighlightPointIsOnHighlight(m_currentHighlight.get(), (CGPoint)m_mousePosition, &onButton);
</del><ins>+ Boolean onButton;
+ m_mouseIsOverHighlight = DDHighlightPointIsOnHighlight(m_currentHighlight.get(), (CGPoint)m_mousePosition, &onButton);
</ins><span class="cx">
</span><del>- mouseHoverStateChanged();
</del><ins>+ mouseHoverStateChanged();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If the UI is not visibile or if the mouse is not over the DDHighlight we have no drawing to do.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTelephoneNumberOverlayControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm (168550 => 168551)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm 2014-05-09 20:48:21 UTC (rev 168550)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TelephoneNumberOverlayControllerMac.mm 2014-05-09 20:57:57 UTC (rev 168551)
</span><span class="lines">@@ -91,9 +91,13 @@
</span><span class="cx"> FrameView& mainFrameView = *m_webPage->corePage()->mainFrame().view();
</span><span class="cx"> rect.setLocation(mainFrameView.windowToContents(viewForRange->contentsToWindow(rect.location())));
</span><span class="cx">
</span><ins>+ // If the selection rect is completely outside this drawing tile, don't process it further
+ if (!rect.intersects(dirtyRect))
+ continue;
+
</ins><span class="cx"> CGRect cgRects[] = { (CGRect)rect };
</span><span class="cx">
</span><del>- RetainPtr<DDHighlightRef> highlight = adoptCF(DDHighlightCreateWithRectsInVisibleRect(nullptr, cgRects, 1, (CGRect)dirtyRect, true));
</del><ins>+ RetainPtr<DDHighlightRef> highlight = adoptCF(DDHighlightCreateWithRectsInVisibleRect(nullptr, cgRects, 1, viewForRange->boundsRect(), true));
</ins><span class="cx"> RefPtr<TelephoneNumberData> telephoneNumberData = TelephoneNumberData::create(range.get(), highlight.get());
</span><span class="cx"> m_telephoneNumberDatas.append(telephoneNumberData);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>