<!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>[174383] 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/174383">174383</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-10-06 20:32:55 -0700 (Mon, 06 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] Fix remaining misuses of abs() and fabsf()
https://bugs.webkit.org/show_bug.cgi?id=130947
Reviewed by Simon Fraser.
Fixed issues found when compiling with -Wabsolute-value.
* platform/ios/ScrollAnimatorIOS.mm:
(WebCore::ScrollAnimatorIOS::handleTouchEvent): Called abs() instead of fabsf for integral types. Explicitly
cast the divisor to float in the call to atanf().
* platform/ios/wak/WKView.mm:
(_WKViewAutoresizeCoord): Explicitly cast origMarginsTotal to an int before calling abs(). Added a FIXME
indicating the strange behavior when origMarginsTotal is in the range (0, 1) (as pointed out by Darin).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformiosScrollAnimatorIOSmm">trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWKViewmm">trunk/Source/WebCore/platform/ios/wak/WKView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (174382 => 174383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-07 03:28:32 UTC (rev 174382)
+++ trunk/Source/WebCore/ChangeLog 2014-10-07 03:32:55 UTC (rev 174383)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-10-06 Andy Estes <aestes@apple.com>
+
+ [iOS] Fix remaining misuses of abs() and fabsf()
+ https://bugs.webkit.org/show_bug.cgi?id=130947
+
+ Reviewed by Simon Fraser.
+
+ Fixed issues found when compiling with -Wabsolute-value.
+
+ * platform/ios/ScrollAnimatorIOS.mm:
+ (WebCore::ScrollAnimatorIOS::handleTouchEvent): Called abs() instead of fabsf for integral types. Explicitly
+ cast the divisor to float in the call to atanf().
+ * platform/ios/wak/WKView.mm:
+ (_WKViewAutoresizeCoord): Explicitly cast origMarginsTotal to an int before calling abs(). Added a FIXME
+ indicating the strange behavior when origMarginsTotal is in the range (0, 1) (as pointed out by Darin).
+
</ins><span class="cx"> 2014-10-06 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> CanvasPattern always has an internal WebCore::Pattern.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosScrollAnimatorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm (174382 => 174383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm 2014-10-07 03:28:32 UTC (rev 174382)
+++ trunk/Source/WebCore/platform/ios/ScrollAnimatorIOS.mm 2014-10-07 03:32:55 UTC (rev 174383)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> if (m_touchScrollAxisLatch == AxisLatchNotComputed) {
</span><span class="cx"> const float lockAngleDegrees = 20;
</span><span class="cx"> if (deltaFromStart.width() && deltaFromStart.height()) {
</span><del>- float dragAngle = atanf(fabsf(deltaFromStart.height()) / fabsf(deltaFromStart.width()));
</del><ins>+ float dragAngle = atanf(static_cast<float>(abs(deltaFromStart.height())) / abs(deltaFromStart.width()));
</ins><span class="cx"> if (dragAngle <= deg2rad(lockAngleDegrees))
</span><span class="cx"> m_touchScrollAxisLatch = AxisLatchHorizontal;
</span><span class="cx"> else if (dragAngle >= deg2rad(90 - lockAngleDegrees))
</span><span class="lines">@@ -146,13 +146,13 @@
</span><span class="cx"> // Horizontal
</span><span class="cx"> if (m_touchScrollAxisLatch != AxisLatchVertical) {
</span><span class="cx"> int delta = touchDelta.width();
</span><del>- handled |= m_scrollableAreaForTouchSequence->scroll(delta < 0 ? ScrollLeft : ScrollRight, ScrollByPixel, fabsf(delta));
</del><ins>+ handled |= m_scrollableAreaForTouchSequence->scroll(delta < 0 ? ScrollLeft : ScrollRight, ScrollByPixel, abs(delta));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Vertical
</span><span class="cx"> if (m_touchScrollAxisLatch != AxisLatchHorizontal) {
</span><span class="cx"> int delta = touchDelta.height();
</span><del>- handled |= m_scrollableAreaForTouchSequence->scroll(delta < 0 ? ScrollUp : ScrollDown, ScrollByPixel, fabsf(delta));
</del><ins>+ handled |= m_scrollableAreaForTouchSequence->scroll(delta < 0 ? ScrollUp : ScrollDown, ScrollByPixel, abs(delta));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Return false until we manage to scroll at all, and then keep returning true until the gesture ends.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWKViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WKView.mm (174382 => 174383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/wak/WKView.mm 2014-10-07 03:28:32 UTC (rev 174382)
+++ trunk/Source/WebCore/platform/ios/wak/WKView.mm 2014-10-07 03:32:55 UTC (rev 174383)
</span><span class="lines">@@ -247,8 +247,9 @@
</span><span class="cx"> }
</span><span class="cx"> // Do the 50/50 split even if XorY = 0 and the WidthOrHeight is only
</span><span class="cx"> // one pixel shorter...
</span><ins>+ // FIXME: If origMarginsTotal is in the range (0, 1) then we won't do the 50/50 split. Is this right?
</ins><span class="cx"> else if (origMarginsTotal == 0.0f
</span><del>- || (abs(origMarginsTotal) == 1)) {
</del><ins>+ || (abs(static_cast<int>(origMarginsTotal)) == 1)) {
</ins><span class="cx"> prop = 0.5f; // Then split it 50:50.
</span><span class="cx"> }
</span><span class="cx"> else {
</span></span></pre>
</div>
</div>
</body>
</html>