<!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>[168977] 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/168977">168977</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2014-05-16 13:53:51 -0700 (Fri, 16 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Link search area for touch events is too large in some cases
https://bugs.webkit.org/show_bug.cgi?id=132988
<rdar://problem/16917843>
Reviewed by Simon Fraser.
* page/ios/FrameIOS.mm:
(WebCore::Frame::qualifyingNodeAtViewportLocation):
- Adjust the search area to screen ppi.
- Remove cut-off at scale 1. This made us pick physically far-away elements when zoomed in.
* platform/PlatformScreen.h:
* platform/ios/PlatformScreenIOS.mm:
(WebCore::mobileGestaltFloatValue):
(WebCore::screenPPIFactor):
Figure out screens physical PPI relative to a base.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageiosFrameIOSmm">trunk/Source/WebCore/page/ios/FrameIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformPlatformScreenh">trunk/Source/WebCore/platform/PlatformScreen.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlatformScreenIOSmm">trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168976 => 168977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-16 20:46:29 UTC (rev 168976)
+++ trunk/Source/WebCore/ChangeLog 2014-05-16 20:53:51 UTC (rev 168977)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-05-16 Antti Koivisto <antti@apple.com>
+
+ Link search area for touch events is too large in some cases
+ https://bugs.webkit.org/show_bug.cgi?id=132988
+ <rdar://problem/16917843>
+
+ Reviewed by Simon Fraser.
+
+ * page/ios/FrameIOS.mm:
+ (WebCore::Frame::qualifyingNodeAtViewportLocation):
+
+ - Adjust the search area to screen ppi.
+ - Remove cut-off at scale 1. This made us pick physically far-away elements when zoomed in.
+
+ * platform/PlatformScreen.h:
+ * platform/ios/PlatformScreenIOS.mm:
+ (WebCore::mobileGestaltFloatValue):
+ (WebCore::screenPPIFactor):
+
+ Figure out screens physical PPI relative to a base.
+
</ins><span class="cx"> 2014-05-16 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [MSE] Crash at WebCore::SourceBuffer::~SourceBuffer + 110
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosFrameIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/FrameIOS.mm (168976 => 168977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/FrameIOS.mm 2014-05-16 20:46:29 UTC (rev 168976)
+++ trunk/Source/WebCore/page/ios/FrameIOS.mm 2014-05-16 20:53:51 UTC (rev 168977)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> #import "NodeTraversal.h"
</span><span class="cx"> #import "Page.h"
</span><span class="cx"> #import "PageTransitionEvent.h"
</span><ins>+#import "PlatformScreen.h"
</ins><span class="cx"> #import "PropertySetCSSStyleDeclaration.h"
</span><span class="cx"> #import "RenderLayer.h"
</span><span class="cx"> #import "RenderLayerCompositor.h"
</span><span class="lines">@@ -429,12 +430,15 @@
</span><span class="cx"> shouldApproximate = false;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- if (approximateNode && shouldApproximate) {
- float scale = page() ? page()->pageScaleFactor() : 1;
</del><span class="cx">
</span><del>- const int defaultMaxRadius = 15;
- int maxRadius = scale < 1 ? static_cast<int>(defaultMaxRadius / scale) : defaultMaxRadius;
</del><span class="cx">
</span><ins>+ float scale = page() ? page()->pageScaleFactor() : 1;
+ float ppiFactor = screenPPIFactor();
+
+ static const float unscaledSearchRadius = 15;
+ int searchRadius = static_cast<int>(unscaledSearchRadius * ppiFactor / scale);
+
+ if (approximateNode && shouldApproximate) {
</ins><span class="cx"> const float testOffsets[] = {
</span><span class="cx"> -.3f, -.3f,
</span><span class="cx"> -.6f, -.6f,
</span><span class="lines">@@ -444,7 +448,7 @@
</span><span class="cx">
</span><span class="cx"> Node* originalApproximateNode = approximateNode;
</span><span class="cx"> for (unsigned n = 0; n < WTF_ARRAY_LENGTH(testOffsets); n += 2) {
</span><del>- IntSize testOffset(testOffsets[n] * maxRadius, testOffsets[n + 1] * maxRadius);
</del><ins>+ IntSize testOffset(testOffsets[n] * searchRadius, testOffsets[n + 1] * searchRadius);
</ins><span class="cx"> IntPoint testPoint = testCenter + testOffset;
</span><span class="cx">
</span><span class="cx"> HitTestResult candidateInfo = eventHandler().hitTestResultAtPoint(testPoint);
</span><span class="lines">@@ -466,12 +470,6 @@
</span><span class="cx"> if (candidate)
</span><span class="cx"> failedNode = candidate;
</span><span class="cx">
</span><del>- // We don't approximate the node if we are dragging, we instead force the user to be precise.
- float scale = page() ? page()->pageScaleFactor() : 1;
-
- const int defaultMaxRadius = 15;
- int maxRadius = (scale < 1.0) ? static_cast<int>(defaultMaxRadius / scale) : defaultMaxRadius;
-
</del><span class="cx"> // The center point was tested earlier.
</span><span class="cx"> const float testOffsets[] = {
</span><span class="cx"> -.3f, -.3f,
</span><span class="lines">@@ -489,10 +487,10 @@
</span><span class="cx"> };
</span><span class="cx"> IntRect bestFrame;
</span><span class="cx"> IntRect testRect(testCenter, IntSize());
</span><del>- testRect.inflate(maxRadius);
</del><ins>+ testRect.inflate(searchRadius);
</ins><span class="cx"> int currentTestRadius = 0;
</span><span class="cx"> for (unsigned n = 0; n < WTF_ARRAY_LENGTH(testOffsets); n += 2) {
</span><del>- IntSize testOffset(testOffsets[n] * maxRadius, testOffsets[n + 1] * maxRadius);
</del><ins>+ IntSize testOffset(testOffsets[n] * searchRadius, testOffsets[n + 1] * searchRadius);
</ins><span class="cx"> IntPoint testPoint = testCenter + testOffset;
</span><span class="cx"> int testRadius = std::max(abs(testOffset.width()), abs(testOffset.height()));
</span><span class="cx"> if (testRadius > currentTestRadius) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPlatformScreenh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/PlatformScreen.h (168976 => 168977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PlatformScreen.h 2014-05-16 20:46:29 UTC (rev 168976)
+++ trunk/Source/WebCore/platform/PlatformScreen.h 2014-05-16 20:53:51 UTC (rev 168977)
</span><span class="lines">@@ -65,6 +65,10 @@
</span><span class="cx"> NSPoint flipScreenPoint(const NSPoint&, NSScreen *);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+ float screenPPIFactor();
+#endif
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // PlatformScreen_h
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlatformScreenIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm (168976 => 168977)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm 2014-05-16 20:46:29 UTC (rev 168976)
+++ trunk/Source/WebCore/platform/ios/PlatformScreenIOS.mm 2014-05-16 20:53:51 UTC (rev 168977)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #import "WAKWindow.h"
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><span class="cx"> #import "Widget.h"
</span><ins>+#import <MobileGestalt.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -87,4 +88,32 @@
</span><span class="cx"> return enclosingIntRect(FloatRect(FloatPoint(), widget->root()->hostWindow()->availableScreenSize()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static float mobileGestaltFloatValue(CFStringRef question)
+{
+ float result = 0;
+ if (CFTypeRef value = MGCopyAnswer(question, 0)) {
+ if (CFGetTypeID(value) == CFNumberGetTypeID())
+ CFNumberGetValue(static_cast<CFNumberRef>(value), kCFNumberFloatType, &result);
+ CFRelease(value);
+ }
+ return result;
+}
+
+float screenPPIFactor()
+{
+ static float ppiFactor;
+
+ static dispatch_once_t onceToken;
+ dispatch_once(&onceToken, ^{
+ float pitch = mobileGestaltFloatValue(kMGQMainScreenPitch);
+ float scale = mobileGestaltFloatValue(kMGQMainScreenScale);
+
+ static const float originalIPhonePPI = 163;
+ float mainScreenPPI = (pitch && scale) ? pitch / scale : originalIPhonePPI;
+ ppiFactor = mainScreenPPI / originalIPhonePPI;
+ });
+
+ return ppiFactor;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>