<!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>[177845] trunk</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/177845">177845</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-01-01 00:32:27 -0800 (Thu, 01 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Saturated arithmetics: Incorrect float/double clamping.
https://bugs.webkit.org/show_bug.cgi?id=139888
rdar://problem/19330885
Reviewed by Simon Fraser.
Clamp float and double values correctly when applying saturated arithmetics.
Source/WebCore:
Test: LayoutUnit test for float overflow.
* platform/LayoutUnit.h:
(WebCore::LayoutUnit::LayoutUnit):
Tools:
* TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformLayoutUnith">trunk/Source/WebCore/platform/LayoutUnit.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreLayoutUnitcpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177844 => 177845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-01 08:06:54 UTC (rev 177844)
+++ trunk/Source/WebCore/ChangeLog 2015-01-01 08:32:27 UTC (rev 177845)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-01 Zalan Bujtas <zalan@apple.com>
+
+ Saturated arithmetics: Incorrect float/double clamping.
+ https://bugs.webkit.org/show_bug.cgi?id=139888
+ rdar://problem/19330885
+
+ Reviewed by Simon Fraser.
+
+ Clamp float and double values correctly when applying saturated arithmetics.
+
+ Test: LayoutUnit test for float overflow.
+
+ * platform/LayoutUnit.h:
+ (WebCore::LayoutUnit::LayoutUnit):
+
</ins><span class="cx"> 2014-12-31 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed the iOS build.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLayoutUnith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LayoutUnit.h (177844 => 177845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LayoutUnit.h 2015-01-01 08:06:54 UTC (rev 177844)
+++ trunk/Source/WebCore/platform/LayoutUnit.h 2015-01-01 08:32:27 UTC (rev 177845)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> LayoutUnit(float value)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><del>- m_value = clampTo<float>(value * kFixedPointDenominator, static_cast<float>(INT_MIN), static_cast<float>(INT_MAX));
</del><ins>+ m_value = clampToInteger(value * kFixedPointDenominator);
</ins><span class="cx"> #else
</span><span class="cx"> REPORT_OVERFLOW(isInBounds(value));
</span><span class="cx"> m_value = value * kFixedPointDenominator;
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> LayoutUnit(double value)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><del>- m_value = clampTo<double>(value * kFixedPointDenominator, static_cast<double>(INT_MIN), static_cast<double>(INT_MAX));
</del><ins>+ m_value = clampToInteger(value * kFixedPointDenominator);
</ins><span class="cx"> #else
</span><span class="cx"> REPORT_OVERFLOW(isInBounds(value));
</span><span class="cx"> m_value = value * kFixedPointDenominator;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (177844 => 177845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-01 08:06:54 UTC (rev 177844)
+++ trunk/Tools/ChangeLog 2015-01-01 08:32:27 UTC (rev 177845)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-01-01 Zalan Bujtas <zalan@apple.com>
+
+ Saturated arithmetics: Incorrect float/double clamping.
+ https://bugs.webkit.org/show_bug.cgi?id=139888
+ rdar://problem/19330885
+
+ Reviewed by Simon Fraser.
+
+ Clamp float and double values correctly when applying saturated arithmetics.
+
+ * TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2014-12-30 Krzysztof Czech <k.czech@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Bump version of ATK used by jhbuild to 2.15.2
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreLayoutUnitcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp (177844 => 177845)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp 2015-01-01 08:06:54 UTC (rev 177844)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/LayoutUnit.cpp 2015-01-01 08:32:27 UTC (rev 177845)
</span><span class="lines">@@ -76,6 +76,10 @@
</span><span class="cx"> ASSERT_NEAR(LayoutUnit(345634.12335f).toFloat(), 345634.12335f, tolerance);
</span><span class="cx"> ASSERT_NEAR(LayoutUnit(-345634.12335f).toFloat(), -345634.12335f, tolerance);
</span><span class="cx"> ASSERT_NEAR(LayoutUnit(-345634).toFloat(), -345634.0f, tolerance);
</span><ins>+ ASSERT_NEAR(LayoutUnit(33554432.f).toFloat(), 33554432.f, tolerance);
+ ASSERT_NEAR(LayoutUnit(-33554432.f).toFloat(), -33554432.f, tolerance);
+ ASSERT_NEAR(LayoutUnit(33554432.f).toDouble(), 33554432.f, tolerance);
+ ASSERT_NEAR(LayoutUnit(-33554432.f).toDouble(), -33554432.f, tolerance);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WebCoreLayoutUnit, LayoutUnitRounding)
</span></span></pre>
</div>
</div>
</body>
</html>