<!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>[173135] 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/173135">173135</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-08-29 19:55:35 -0700 (Fri, 29 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel layout: Remove LayoutUnit's kEffectiveFixedPointDenominator.
https://bugs.webkit.org/show_bug.cgi?id=136383.
Reviewed by Simon Fraser.
There's only one subpixel denominator now.
No change in functionality.
* platform/LayoutUnit.h:
(WebCore::LayoutUnit::LayoutUnit):
(WebCore::LayoutUnit::fromFloatCeil):
(WebCore::LayoutUnit::fromFloatFloor):
(WebCore::LayoutUnit::toInt):
(WebCore::LayoutUnit::toFloat):
(WebCore::LayoutUnit::toDouble):
(WebCore::LayoutUnit::operator++):
(WebCore::LayoutUnit::ceil):
(WebCore::LayoutUnit::round):
(WebCore::LayoutUnit::floor):
(WebCore::LayoutUnit::ceilToFloat):
(WebCore::LayoutUnit::fraction):
(WebCore::LayoutUnit::epsilon):
(WebCore::LayoutUnit::nearlyMax):
(WebCore::LayoutUnit::nearlyMin):
(WebCore::LayoutUnit::isInBounds):
(WebCore::LayoutUnit::setValue):
(WebCore::boundedMultiply):
(WebCore::operator*):
(WebCore::operator/):
(WebCore::operator%):
(WebCore::roundToDevicePixel):
(WebCore::floorToDevicePixel):
(WebCore::ceilToDevicePixel):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173134 => 173135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-30 02:55:02 UTC (rev 173134)
+++ trunk/Source/WebCore/ChangeLog 2014-08-30 02:55:35 UTC (rev 173135)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2014-08-29 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ Subpixel layout: Remove LayoutUnit's kEffectiveFixedPointDenominator.
+ https://bugs.webkit.org/show_bug.cgi?id=136383.
+
+ Reviewed by Simon Fraser.
+
+ There's only one subpixel denominator now.
+
+ No change in functionality.
+
+ * platform/LayoutUnit.h:
+ (WebCore::LayoutUnit::LayoutUnit):
+ (WebCore::LayoutUnit::fromFloatCeil):
+ (WebCore::LayoutUnit::fromFloatFloor):
+ (WebCore::LayoutUnit::toInt):
+ (WebCore::LayoutUnit::toFloat):
+ (WebCore::LayoutUnit::toDouble):
+ (WebCore::LayoutUnit::operator++):
+ (WebCore::LayoutUnit::ceil):
+ (WebCore::LayoutUnit::round):
+ (WebCore::LayoutUnit::floor):
+ (WebCore::LayoutUnit::ceilToFloat):
+ (WebCore::LayoutUnit::fraction):
+ (WebCore::LayoutUnit::epsilon):
+ (WebCore::LayoutUnit::nearlyMax):
+ (WebCore::LayoutUnit::nearlyMin):
+ (WebCore::LayoutUnit::isInBounds):
+ (WebCore::LayoutUnit::setValue):
+ (WebCore::boundedMultiply):
+ (WebCore::operator*):
+ (WebCore::operator/):
+ (WebCore::operator%):
+ (WebCore::roundToDevicePixel):
+ (WebCore::floorToDevicePixel):
+ (WebCore::ceilToDevicePixel):
+
+2014-08-29 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> Rename updatePreferredWidth to make it more explicit.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136389
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLayoutUnith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LayoutUnit.h (173134 => 173135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LayoutUnit.h 2014-08-30 02:55:02 UTC (rev 173134)
+++ trunk/Source/WebCore/platform/LayoutUnit.h 2014-08-30 02:55:35 UTC (rev 173135)
</span><span class="lines">@@ -56,9 +56,8 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static const int kFixedPointDenominator = 64;
</span><del>-static const int kEffectiveFixedPointDenominator = kFixedPointDenominator;
-const int intMaxForLayoutUnit = INT_MAX / kEffectiveFixedPointDenominator;
-const int intMinForLayoutUnit = INT_MIN / kEffectiveFixedPointDenominator;
</del><ins>+const int intMaxForLayoutUnit = INT_MAX / kFixedPointDenominator;
+const int intMinForLayoutUnit = INT_MIN / kFixedPointDenominator;
</ins><span class="cx">
</span><span class="cx"> class LayoutUnit {
</span><span class="cx"> public:
</span><span class="lines">@@ -69,37 +68,37 @@
</span><span class="cx"> LayoutUnit(unsigned long value)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><del>- m_value = clampTo<int>(value * kEffectiveFixedPointDenominator);
</del><ins>+ m_value = clampTo<int>(value * kFixedPointDenominator);
</ins><span class="cx"> #else
</span><span class="cx"> REPORT_OVERFLOW(isInBounds(static_cast<unsigned>(value)));
</span><del>- m_value = value * kEffectiveFixedPointDenominator;
</del><ins>+ m_value = value * kFixedPointDenominator;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> LayoutUnit(unsigned long long value)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><del>- m_value = clampTo<int>(value * kEffectiveFixedPointDenominator);
</del><ins>+ m_value = clampTo<int>(value * kFixedPointDenominator);
</ins><span class="cx"> #else
</span><span class="cx"> REPORT_OVERFLOW(isInBounds(static_cast<unsigned>(value)));
</span><del>- m_value = static_cast<int>(value * kEffectiveFixedPointDenominator);
</del><ins>+ m_value = static_cast<int>(value * kFixedPointDenominator);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</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 * kEffectiveFixedPointDenominator, static_cast<float>(INT_MIN), static_cast<float>(INT_MAX));
</del><ins>+ m_value = clampTo<float>(value * kFixedPointDenominator, static_cast<float>(INT_MIN), static_cast<float>(INT_MAX));
</ins><span class="cx"> #else
</span><span class="cx"> REPORT_OVERFLOW(isInBounds(value));
</span><del>- m_value = value * kEffectiveFixedPointDenominator;
</del><ins>+ m_value = value * kFixedPointDenominator;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</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 * kEffectiveFixedPointDenominator, static_cast<double>(INT_MIN), static_cast<double>(INT_MAX));
</del><ins>+ m_value = clampTo<double>(value * kFixedPointDenominator, static_cast<double>(INT_MIN), static_cast<double>(INT_MAX));
</ins><span class="cx"> #else
</span><span class="cx"> REPORT_OVERFLOW(isInBounds(value));
</span><del>- m_value = value * kEffectiveFixedPointDenominator;
</del><ins>+ m_value = value * kFixedPointDenominator;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -112,10 +111,10 @@
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit v;
</span><span class="cx"> #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><del>- v.m_value = clampToInteger(ceilf(value * kEffectiveFixedPointDenominator));
</del><ins>+ v.m_value = clampToInteger(ceilf(value * kFixedPointDenominator));
</ins><span class="cx"> #else
</span><span class="cx"> REPORT_OVERFLOW(isInBounds(value));
</span><del>- v.m_value = ceilf(value * kEffectiveFixedPointDenominator);
</del><ins>+ v.m_value = ceilf(value * kFixedPointDenominator);
</ins><span class="cx"> #endif
</span><span class="cx"> return v;
</span><span class="cx"> }
</span><span class="lines">@@ -124,10 +123,10 @@
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit v;
</span><span class="cx"> #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><del>- v.m_value = clampToInteger(floorf(value * kEffectiveFixedPointDenominator));
</del><ins>+ v.m_value = clampToInteger(floorf(value * kFixedPointDenominator));
</ins><span class="cx"> #else
</span><span class="cx"> REPORT_OVERFLOW(isInBounds(value));
</span><del>- v.m_value = floorf(value * kEffectiveFixedPointDenominator);
</del><ins>+ v.m_value = floorf(value * kFixedPointDenominator);
</ins><span class="cx"> #endif
</span><span class="cx"> return v;
</span><span class="cx"> }
</span><span class="lines">@@ -148,18 +147,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int toInt() const { return m_value / kEffectiveFixedPointDenominator; }
- float toFloat() const { return static_cast<float>(m_value) / kEffectiveFixedPointDenominator; }
- double toDouble() const { return static_cast<double>(m_value) / kEffectiveFixedPointDenominator; }
- float ceilToFloat() const
- {
- float floatValue = toFloat();
- if (static_cast<int>(floatValue * kEffectiveFixedPointDenominator) == m_value)
- return floatValue;
- if (floatValue > 0)
- return nextafterf(floatValue, std::numeric_limits<float>::max());
- return nextafterf(floatValue, std::numeric_limits<float>::min());
- }
</del><ins>+ int toInt() const { return m_value / kFixedPointDenominator; }
+ float toFloat() const { return static_cast<float>(m_value) / kFixedPointDenominator; }
+ double toDouble() const { return static_cast<double>(m_value) / kFixedPointDenominator; }
</ins><span class="cx"> unsigned toUnsigned() const { REPORT_OVERFLOW(m_value >= 0); return toInt(); }
</span><span class="cx">
</span><span class="cx"> operator int() const { return toInt(); }
</span><span class="lines">@@ -170,7 +160,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit& operator++()
</span><span class="cx"> {
</span><del>- m_value += kEffectiveFixedPointDenominator;
</del><ins>+ m_value += kFixedPointDenominator;
</ins><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -195,11 +185,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><del>- if (UNLIKELY(m_value >= INT_MAX - kEffectiveFixedPointDenominator + 1))
</del><ins>+ if (UNLIKELY(m_value >= INT_MAX - kFixedPointDenominator + 1))
</ins><span class="cx"> return intMaxForLayoutUnit;
</span><span class="cx"> #endif
</span><span class="cx"> if (m_value >= 0)
</span><del>- return (m_value + kEffectiveFixedPointDenominator - 1) / kEffectiveFixedPointDenominator;
</del><ins>+ return (m_value + kFixedPointDenominator - 1) / kFixedPointDenominator;
</ins><span class="cx"> return toInt();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -207,32 +197,42 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><span class="cx"> if (m_value > 0)
</span><del>- return saturatedAddition(rawValue(), kEffectiveFixedPointDenominator / 2) / kEffectiveFixedPointDenominator;
- return saturatedSubtraction(rawValue(), (kEffectiveFixedPointDenominator / 2) - 1) / kEffectiveFixedPointDenominator;
</del><ins>+ return saturatedAddition(rawValue(), kFixedPointDenominator / 2) / kFixedPointDenominator;
+ return saturatedSubtraction(rawValue(), (kFixedPointDenominator / 2) - 1) / kFixedPointDenominator;
</ins><span class="cx"> #else
</span><span class="cx"> if (m_value > 0)
</span><del>- return (m_value + (kEffectiveFixedPointDenominator / 2)) / kEffectiveFixedPointDenominator;
- return (m_value - ((kEffectiveFixedPointDenominator / 2) - 1)) / kEffectiveFixedPointDenominator;
</del><ins>+ return (m_value + (kFixedPointDenominator / 2)) / kFixedPointDenominator;
+ return (m_value - ((kFixedPointDenominator / 2) - 1)) / kFixedPointDenominator;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int floor() const
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><del>- if (UNLIKELY(m_value <= INT_MIN + kEffectiveFixedPointDenominator - 1))
</del><ins>+ if (UNLIKELY(m_value <= INT_MIN + kFixedPointDenominator - 1))
</ins><span class="cx"> return intMinForLayoutUnit;
</span><span class="cx"> #endif
</span><span class="cx"> if (m_value >= 0)
</span><span class="cx"> return toInt();
</span><del>- return (m_value - kEffectiveFixedPointDenominator + 1) / kEffectiveFixedPointDenominator;
</del><ins>+ return (m_value - kFixedPointDenominator + 1) / kFixedPointDenominator;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ float ceilToFloat() const
+ {
+ float floatValue = toFloat();
+ if (static_cast<int>(floatValue * kFixedPointDenominator) == m_value)
+ return floatValue;
+ if (floatValue > 0)
+ return nextafterf(floatValue, std::numeric_limits<float>::max());
+ return nextafterf(floatValue, std::numeric_limits<float>::min());
+ }
+
</ins><span class="cx"> LayoutUnit fraction() const
</span><span class="cx"> {
</span><span class="cx"> // Add the fraction to the size (as opposed to the full location) to avoid overflows.
</span><span class="cx"> // Compute fraction using the mod operator to preserve the sign of the value as it may affect rounding.
</span><span class="cx"> LayoutUnit fraction;
</span><del>- fraction.setRawValue(rawValue() % kEffectiveFixedPointDenominator);
</del><ins>+ fraction.setRawValue(rawValue() % kFixedPointDenominator);
</ins><span class="cx"> return fraction;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> || rawValue() == std::numeric_limits<int>::min();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static float epsilon() { return 1.0f / kEffectiveFixedPointDenominator; }
</del><ins>+ static float epsilon() { return 1.0f / kFixedPointDenominator; }
</ins><span class="cx">
</span><span class="cx"> static const LayoutUnit max()
</span><span class="cx"> {
</span><span class="lines">@@ -261,13 +261,13 @@
</span><span class="cx"> static const LayoutUnit nearlyMax()
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit m;
</span><del>- m.m_value = std::numeric_limits<int>::max() - kEffectiveFixedPointDenominator / 2;
</del><ins>+ m.m_value = std::numeric_limits<int>::max() - kFixedPointDenominator / 2;
</ins><span class="cx"> return m;
</span><span class="cx"> }
</span><span class="cx"> static const LayoutUnit nearlyMin()
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit m;
</span><del>- m.m_value = std::numeric_limits<int>::min() + kEffectiveFixedPointDenominator / 2;
</del><ins>+ m.m_value = std::numeric_limits<int>::min() + kFixedPointDenominator / 2;
</ins><span class="cx"> return m;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -279,15 +279,15 @@
</span><span class="cx"> private:
</span><span class="cx"> static bool isInBounds(int value)
</span><span class="cx"> {
</span><del>- return ::abs(value) <= std::numeric_limits<int>::max() / kEffectiveFixedPointDenominator;
</del><ins>+ return ::abs(value) <= std::numeric_limits<int>::max() / kFixedPointDenominator;
</ins><span class="cx"> }
</span><span class="cx"> static bool isInBounds(unsigned value)
</span><span class="cx"> {
</span><del>- return value <= static_cast<unsigned>(std::numeric_limits<int>::max()) / kEffectiveFixedPointDenominator;
</del><ins>+ return value <= static_cast<unsigned>(std::numeric_limits<int>::max()) / kFixedPointDenominator;
</ins><span class="cx"> }
</span><span class="cx"> static bool isInBounds(double value)
</span><span class="cx"> {
</span><del>- return ::fabs(value) <= std::numeric_limits<int>::max() / kEffectiveFixedPointDenominator;
</del><ins>+ return ::fabs(value) <= std::numeric_limits<int>::max() / kFixedPointDenominator;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline void setValue(int value)
</span><span class="lines">@@ -298,10 +298,10 @@
</span><span class="cx"> else if (value < intMinForLayoutUnit)
</span><span class="cx"> m_value = std::numeric_limits<int>::min();
</span><span class="cx"> else
</span><del>- m_value = value * kEffectiveFixedPointDenominator;
</del><ins>+ m_value = value * kFixedPointDenominator;
</ins><span class="cx"> #else
</span><span class="cx"> REPORT_OVERFLOW(isInBounds(value));
</span><del>- m_value = value * kEffectiveFixedPointDenominator;
</del><ins>+ m_value = value * kFixedPointDenominator;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> inline void setValue(unsigned value)
</span><span class="lines">@@ -310,10 +310,10 @@
</span><span class="cx"> if (value >= static_cast<unsigned>(intMaxForLayoutUnit))
</span><span class="cx"> m_value = std::numeric_limits<int>::max();
</span><span class="cx"> else
</span><del>- m_value = value * kEffectiveFixedPointDenominator;
</del><ins>+ m_value = value * kFixedPointDenominator;
</ins><span class="cx"> #else
</span><span class="cx"> REPORT_OVERFLOW(isInBounds(value));
</span><del>- m_value = value * kEffectiveFixedPointDenominator;
</del><ins>+ m_value = value * kFixedPointDenominator;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx"> // For multiplication that's prone to overflow, this bounds it to LayoutUnit::max() and ::min()
</span><span class="cx"> inline LayoutUnit boundedMultiply(const LayoutUnit& a, const LayoutUnit& b)
</span><span class="cx"> {
</span><del>- int64_t result = static_cast<int64_t>(a.rawValue()) * static_cast<int64_t>(b.rawValue()) / kEffectiveFixedPointDenominator;
</del><ins>+ int64_t result = static_cast<int64_t>(a.rawValue()) * static_cast<int64_t>(b.rawValue()) / kFixedPointDenominator;
</ins><span class="cx"> int32_t high = static_cast<int32_t>(result >> 32);
</span><span class="cx"> int32_t low = static_cast<int32_t>(result);
</span><span class="cx"> uint32_t saturated = (static_cast<uint32_t>(a.rawValue() ^ b.rawValue()) >> 31) + std::numeric_limits<int>::max();
</span><span class="lines">@@ -502,7 +502,7 @@
</span><span class="cx"> return boundedMultiply(a, b);
</span><span class="cx"> #else
</span><span class="cx"> LayoutUnit returnVal;
</span><del>- long long rawVal = static_cast<long long>(a.rawValue()) * b.rawValue() / kEffectiveFixedPointDenominator;
</del><ins>+ long long rawVal = static_cast<long long>(a.rawValue()) * b.rawValue() / kFixedPointDenominator;
</ins><span class="cx"> returnVal.setRawValue(rawVal);
</span><span class="cx"> return returnVal;
</span><span class="cx"> #endif
</span><span class="lines">@@ -581,7 +581,7 @@
</span><span class="cx"> inline LayoutUnit operator/(const LayoutUnit& a, const LayoutUnit& b)
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit returnVal;
</span><del>- long long rawVal = static_cast<long long>(kEffectiveFixedPointDenominator) * a.rawValue() / b.rawValue();
</del><ins>+ long long rawVal = static_cast<long long>(kFixedPointDenominator) * a.rawValue() / b.rawValue();
</ins><span class="cx"> #if ENABLE(SATURATED_LAYOUT_ARITHMETIC)
</span><span class="cx"> returnVal.setRawValue(clampTo<int>(rawVal));
</span><span class="cx"> #else
</span><span class="lines">@@ -757,8 +757,8 @@
</span><span class="cx"> {
</span><span class="cx"> // This calculates the modulo so that: a = (a / b) * b + a % b.
</span><span class="cx"> LayoutUnit returnVal;
</span><del>- long long rawVal = (static_cast<long long>(kEffectiveFixedPointDenominator) * a.rawValue()) % b.rawValue();
- returnVal.setRawValue(rawVal / kEffectiveFixedPointDenominator);
</del><ins>+ long long rawVal = (static_cast<long long>(kFixedPointDenominator) * a.rawValue()) % b.rawValue();
+ returnVal.setRawValue(rawVal / kFixedPointDenominator);
</ins><span class="cx"> return returnVal;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -878,7 +878,7 @@
</span><span class="cx">
</span><span class="cx"> inline float roundToDevicePixel(LayoutUnit value, const float pixelSnappingFactor, bool needsDirectionalRounding = false)
</span><span class="cx"> {
</span><del>- auto roundInternal = [&] (float valueToRound) { return roundf((valueToRound * pixelSnappingFactor) / kEffectiveFixedPointDenominator) / pixelSnappingFactor; };
</del><ins>+ auto roundInternal = [&] (float valueToRound) { return roundf((valueToRound * pixelSnappingFactor) / kFixedPointDenominator) / pixelSnappingFactor; };
</ins><span class="cx">
</span><span class="cx"> float adjustedValue = value.rawValue() - (needsDirectionalRounding ? LayoutUnit::epsilon() / 2.0f : 0);
</span><span class="cx"> if (adjustedValue >= 0)
</span><span class="lines">@@ -887,17 +887,17 @@
</span><span class="cx"> // This adjusts directional rounding on negative halfway values. It produces the same direction for both negative and positive values.
</span><span class="cx"> // It helps snapping relative negative coordinates to the same position as if they were positive absolute coordinates.
</span><span class="cx"> float translateOrigin = fabsf(adjustedValue - LayoutUnit::fromPixel(1));
</span><del>- return roundInternal(adjustedValue + (translateOrigin * kEffectiveFixedPointDenominator)) - translateOrigin;
</del><ins>+ return roundInternal(adjustedValue + (translateOrigin * kFixedPointDenominator)) - translateOrigin;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline float floorToDevicePixel(LayoutUnit value, float pixelSnappingFactor)
</span><span class="cx"> {
</span><del>- return floorf((value.rawValue() * pixelSnappingFactor) / kEffectiveFixedPointDenominator) / pixelSnappingFactor;
</del><ins>+ return floorf((value.rawValue() * pixelSnappingFactor) / kFixedPointDenominator) / pixelSnappingFactor;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline float ceilToDevicePixel(LayoutUnit value, float pixelSnappingFactor)
</span><span class="cx"> {
</span><del>- return ceilf((value.rawValue() * pixelSnappingFactor) / kEffectiveFixedPointDenominator) / pixelSnappingFactor;
</del><ins>+ return ceilf((value.rawValue() * pixelSnappingFactor) / kFixedPointDenominator) / pixelSnappingFactor;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline LayoutUnit absoluteValue(const LayoutUnit& value)
</span></span></pre>
</div>
</div>
</body>
</html>