<!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>[169567] 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/169567">169567</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-03 13:59:04 -0700 (Tue, 03 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Align the highlight rects with device pixels
https://bugs.webkit.org/show_bug.cgi?id=133464
Source/WebCore:
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-06-03
Reviewed by Enrica Casucci.
Add utility functions to pixel align points and rects.
* WebCore.exp.in:
* platform/graphics/FloatPoint.h:
(WebCore::flooredToDevicePixels):
(WebCore::ceiledToDevicePixels):
* platform/graphics/FloatRect.cpp:
(WebCore::enclosingRectExtendedToDevicePixels):
* platform/graphics/FloatRect.h:
Source/WebKit2:
<rdar://problem/16708861>
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-06-03
Reviewed by Enrica Casucci.
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _showTapHighlightWithColor:WebCore::quads:WebCore::topLeftRadius:WebCore::topRightRadius:WebCore::bottomLeftRadius:WebCore::bottomRightRadius:WebCore::]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatPointh">trunk/Source/WebCore/platform/graphics/FloatPoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRectcpp">trunk/Source/WebCore/platform/graphics/FloatRect.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFloatRecth">trunk/Source/WebCore/platform/graphics/FloatRect.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169566 => 169567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-03 20:13:32 UTC (rev 169566)
+++ trunk/Source/WebCore/ChangeLog 2014-06-03 20:59:04 UTC (rev 169567)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-06-03 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] Align the highlight rects with device pixels
+ https://bugs.webkit.org/show_bug.cgi?id=133464
+
+ Reviewed by Enrica Casucci.
+
+ Add utility functions to pixel align points and rects.
+
+ * WebCore.exp.in:
+ * platform/graphics/FloatPoint.h:
+ (WebCore::flooredToDevicePixels):
+ (WebCore::ceiledToDevicePixels):
+ * platform/graphics/FloatRect.cpp:
+ (WebCore::enclosingRectExtendedToDevicePixels):
+ * platform/graphics/FloatRect.h:
+
</ins><span class="cx"> 2014-06-03 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Prepopulated tiles may never be unparented from TileGrids with aggressive tile retention on
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (169566 => 169567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-06-03 20:13:32 UTC (rev 169566)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-03 20:59:04 UTC (rev 169567)
</span><span class="lines">@@ -2638,6 +2638,7 @@
</span><span class="cx"> __ZN7WebCore31applicationIsMicrosoftMessengerEv
</span><span class="cx"> __ZN7WebCore31enableURLSchemeCanonicalizationEb
</span><span class="cx"> __ZN7WebCore33applicationIsTheEconomistOnIPhoneEv
</span><ins>+__ZN7WebCore35enclosingRectExtendedToDevicePixelsERKNS_9FloatRectEf
</ins><span class="cx"> __ZN7WebCore35positionOfNextBoundaryOfGranularityERKNS_15VisiblePositionENS_15TextGranularityENS_18SelectionDirectionE
</span><span class="cx"> __ZN7WebCore41initializeHTTPConnectionSettingsOnStartupEv
</span><span class="cx"> __ZN7WebCore4FontC1ERKNS_16FontPlatformDataEN3WTF10PassRefPtrINS_12FontSelectorEEE
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatPointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatPoint.h (169566 => 169567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatPoint.h 2014-06-03 20:13:32 UTC (rev 169566)
+++ trunk/Source/WebCore/platform/graphics/FloatPoint.h 2014-06-03 20:59:04 UTC (rev 169567)
</span><span class="lines">@@ -220,11 +220,21 @@
</span><span class="cx"> return IntPoint(clampToInteger(floorf(p.x())), clampToInteger(floorf(p.y())));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline FloatPoint flooredToDevicePixels(const FloatPoint& p, float deviceScaleFactor)
+{
+ return FloatPoint(floorf(p.x() * deviceScaleFactor) / deviceScaleFactor, floorf(p.y() * deviceScaleFactor) / deviceScaleFactor);
+}
+
</ins><span class="cx"> inline IntPoint ceiledIntPoint(const FloatPoint& p)
</span><span class="cx"> {
</span><span class="cx"> return IntPoint(clampToInteger(ceilf(p.x())), clampToInteger(ceilf(p.y())));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline FloatPoint ceiledToDevicePixels(const FloatPoint& p, float deviceScaleFactor)
+{
+ return FloatPoint(ceilf(p.x() * deviceScaleFactor) / deviceScaleFactor, ceilf(p.y() * deviceScaleFactor) / deviceScaleFactor);
+}
+
</ins><span class="cx"> inline IntSize flooredIntSize(const FloatPoint& p)
</span><span class="cx"> {
</span><span class="cx"> return IntSize(clampToInteger(floorf(p.x())), clampToInteger(floorf(p.y())));
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRect.cpp (169566 => 169567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRect.cpp 2014-06-03 20:13:32 UTC (rev 169566)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.cpp 2014-06-03 20:59:04 UTC (rev 169567)
</span><span class="lines">@@ -206,6 +206,13 @@
</span><span class="cx"> setLocationAndSizeFromEdges(left, top, right, bottom);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FloatRect enclosingRectExtendedToDevicePixels(const FloatRect& rect, float deviceScaleFactor)
+{
+ FloatPoint location = flooredToDevicePixels(rect.minXMinYCorner(), deviceScaleFactor);
+ FloatPoint maxPoint = ceiledToDevicePixels(rect.maxXMaxYCorner(), deviceScaleFactor);
+ return FloatRect(location, maxPoint - location);
+}
+
</ins><span class="cx"> IntRect enclosingIntRect(const FloatRect& rect)
</span><span class="cx"> {
</span><span class="cx"> IntPoint location = flooredIntPoint(rect.minXMinYCorner());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFloatRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (169566 => 169567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FloatRect.h 2014-06-03 20:13:32 UTC (rev 169566)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.h 2014-06-03 20:59:04 UTC (rev 169567)
</span><span class="lines">@@ -246,6 +246,7 @@
</span><span class="cx"> return *this == infiniteRect();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+FloatRect enclosingRectExtendedToDevicePixels(const FloatRect&, float deviceScaleFactor);
</ins><span class="cx"> IntRect enclosingIntRect(const FloatRect&);
</span><span class="cx">
</span><span class="cx"> // Returns a valid IntRect contained within the given FloatRect.
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169566 => 169567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-03 20:13:32 UTC (rev 169566)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-03 20:59:04 UTC (rev 169567)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-06-03 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] Align the highlight rects with device pixels
+ https://bugs.webkit.org/show_bug.cgi?id=133464
+ <rdar://problem/16708861>
+
+ Reviewed by Enrica Casucci.
+
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView _showTapHighlightWithColor:WebCore::quads:WebCore::topLeftRadius:WebCore::topRightRadius:WebCore::bottomLeftRadius:WebCore::bottomRightRadius:WebCore::]):
+
</ins><span class="cx"> 2014-06-02 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (iOS WebKit2): Single tap in pages with focus on load will clear the selection after the keyboard appears.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm (169566 => 169567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-06-03 20:13:32 UTC (rev 169566)
+++ trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm 2014-06-03 20:59:04 UTC (rev 169567)
</span><span class="lines">@@ -401,6 +401,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool allHighlightRectsAreRectilinear = true;
</span><ins>+ float deviceScaleFactor = _page->deviceScaleFactor();
</ins><span class="cx"> const size_t quadCount = highlightedQuads.size();
</span><span class="cx"> RetainPtr<NSMutableArray> rects = adoptNS([[NSMutableArray alloc] initWithCapacity:static_cast<const NSUInteger>(quadCount)]);
</span><span class="cx"> for (size_t i = 0; i < quadCount; ++i) {
</span><span class="lines">@@ -408,8 +409,9 @@
</span><span class="cx"> if (quad.isRectilinear()) {
</span><span class="cx"> FloatRect boundingBox = quad.boundingBox();
</span><span class="cx"> boundingBox.scale(selfScale);
</span><del>- CGRect rect = CGRectInset(boundingBox, -UIWebViewMinimumHighlightRadius, -UIWebViewMinimumHighlightRadius);
- [rects addObject:[NSValue valueWithCGRect:rect]];
</del><ins>+ boundingBox.inflate(UIWebViewMinimumHighlightRadius);
+ CGRect pixelAlignedRect = static_cast<CGRect>(enclosingRectExtendedToDevicePixels(boundingBox, deviceScaleFactor));
+ [rects addObject:[NSValue valueWithCGRect:pixelAlignedRect]];
</ins><span class="cx"> } else {
</span><span class="cx"> allHighlightRectsAreRectilinear = false;
</span><span class="cx"> rects.clear();
</span></span></pre>
</div>
</div>
</body>
</html>