<!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>[215169] 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/215169">215169</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-04-09 19:41:04 -0700 (Sun, 09 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WTF] Annotate Seconds' member functions and operators with constexpr
https://bugs.webkit.org/show_bug.cgi?id=170662
Reviewed by Daniel Bates.
Source/WebCore:
* page/Frame.cpp:
Source/WTF:
Annotate Seconds' member functions and operators with constexpr.
It allows us to use Seconds calculation in compile time and use these
calculation for static const global variables.
operator% is an exception: it uses fmod and it is not offered as constexpr.
* wtf/MathExtras.h:
(defaultMinimumForClamp):
(defaultMaximumForClamp):
(clampToAccepting64):
Super unfortunate ugly code. This is because GCC 4.9 does not support C++14 relaxed constexpr.
* wtf/Seconds.h:
(WTF::Seconds::Seconds):
(WTF::Seconds::value):
(WTF::Seconds::minutes):
(WTF::Seconds::seconds):
(WTF::Seconds::milliseconds):
(WTF::Seconds::microseconds):
(WTF::Seconds::nanoseconds):
(WTF::Seconds::operator bool):
(WTF::Seconds::operator+):
(WTF::Seconds::operator-):
(WTF::Seconds::operator*):
(WTF::Seconds::operator/):
(WTF::Seconds::operator==):
(WTF::Seconds::operator!=):
(WTF::Seconds::operator<):
(WTF::Seconds::operator>):
(WTF::Seconds::operator<=):
(WTF::Seconds::operator>=):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfMathExtrash">trunk/Source/WTF/wtf/MathExtras.h</a></li>
<li><a href="#trunkSourceWTFwtfSecondsh">trunk/Source/WTF/wtf/Seconds.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (215168 => 215169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-04-09 23:47:14 UTC (rev 215168)
+++ trunk/Source/WTF/ChangeLog 2017-04-10 02:41:04 UTC (rev 215169)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2017-04-09 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [WTF] Annotate Seconds' member functions and operators with constexpr
+ https://bugs.webkit.org/show_bug.cgi?id=170662
+
+ Reviewed by Daniel Bates.
+
+ Annotate Seconds' member functions and operators with constexpr.
+ It allows us to use Seconds calculation in compile time and use these
+ calculation for static const global variables.
+
+ operator% is an exception: it uses fmod and it is not offered as constexpr.
+
+ * wtf/MathExtras.h:
+ (defaultMinimumForClamp):
+ (defaultMaximumForClamp):
+ (clampToAccepting64):
+ Super unfortunate ugly code. This is because GCC 4.9 does not support C++14 relaxed constexpr.
+
+ * wtf/Seconds.h:
+ (WTF::Seconds::Seconds):
+ (WTF::Seconds::value):
+ (WTF::Seconds::minutes):
+ (WTF::Seconds::seconds):
+ (WTF::Seconds::milliseconds):
+ (WTF::Seconds::microseconds):
+ (WTF::Seconds::nanoseconds):
+ (WTF::Seconds::operator bool):
+ (WTF::Seconds::operator+):
+ (WTF::Seconds::operator-):
+ (WTF::Seconds::operator*):
+ (WTF::Seconds::operator/):
+ (WTF::Seconds::operator==):
+ (WTF::Seconds::operator!=):
+ (WTF::Seconds::operator<):
+ (WTF::Seconds::operator>):
+ (WTF::Seconds::operator<=):
+ (WTF::Seconds::operator>=):
+
</ins><span class="cx"> 2017-04-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Start dropping Timer API dealing with double
</span></span></pre></div>
<a id="trunkSourceWTFwtfMathExtrash"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MathExtras.h (215168 => 215169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MathExtras.h 2017-04-09 23:47:14 UTC (rev 215168)
+++ trunk/Source/WTF/wtf/MathExtras.h 2017-04-10 02:41:04 UTC (rev 215169)
</span><span class="lines">@@ -141,10 +141,10 @@
</span><span class="cx"> inline float grad2rad(float g) { return g * piFloat / 200.0f; }
</span><span class="cx">
</span><span class="cx"> // std::numeric_limits<T>::min() returns the smallest positive value for floating point types
</span><del>-template<typename T> inline T defaultMinimumForClamp() { return std::numeric_limits<T>::min(); }
-template<> inline float defaultMinimumForClamp() { return -std::numeric_limits<float>::max(); }
-template<> inline double defaultMinimumForClamp() { return -std::numeric_limits<double>::max(); }
-template<typename T> inline T defaultMaximumForClamp() { return std::numeric_limits<T>::max(); }
</del><ins>+template<typename T> constexpr inline T defaultMinimumForClamp() { return std::numeric_limits<T>::min(); }
+template<> constexpr inline float defaultMinimumForClamp() { return -std::numeric_limits<float>::max(); }
+template<> constexpr inline double defaultMinimumForClamp() { return -std::numeric_limits<double>::max(); }
+template<typename T> constexpr inline T defaultMaximumForClamp() { return std::numeric_limits<T>::max(); }
</ins><span class="cx">
</span><span class="cx"> template<typename T> inline T clampTo(double value, T min = defaultMinimumForClamp<T>(), T max = defaultMaximumForClamp<T>())
</span><span class="cx"> {
</span><span class="lines">@@ -195,13 +195,9 @@
</span><span class="cx">
</span><span class="cx"> // Explicitly accept 64bit result when clamping double value.
</span><span class="cx"> // Keep in mind that double can only represent 53bit integer precisely.
</span><del>-template<typename T> inline T clampToAccepting64(double value, T min = defaultMinimumForClamp<T>(), T max = defaultMaximumForClamp<T>())
</del><ins>+template<typename T> constexpr inline T clampToAccepting64(double value, T min = defaultMinimumForClamp<T>(), T max = defaultMaximumForClamp<T>())
</ins><span class="cx"> {
</span><del>- if (value >= static_cast<double>(max))
- return max;
- if (value <= static_cast<double>(min))
- return min;
- return static_cast<T>(value);
</del><ins>+ return (value >= static_cast<double>(max)) ? max : ((value <= static_cast<double>(min)) ? min : static_cast<T>(value));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool isWithinIntRange(float x)
</span></span></pre></div>
<a id="trunkSourceWTFwtfSecondsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Seconds.h (215168 => 215169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Seconds.h 2017-04-09 23:47:14 UTC (rev 215168)
+++ trunk/Source/WTF/wtf/Seconds.h 2017-04-10 02:41:04 UTC (rev 215169)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class Seconds {
</span><span class="cx"> public:
</span><del>- Seconds() { }
</del><ins>+ constexpr Seconds() { }
</ins><span class="cx">
</span><span class="cx"> explicit constexpr Seconds(double value)
</span><span class="cx"> : m_value(value)
</span><span class="lines">@@ -44,13 +44,13 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- double value() const { return m_value; }
</del><ins>+ constexpr double value() const { return m_value; }
</ins><span class="cx">
</span><del>- double minutes() const { return m_value / 60; }
- double seconds() const { return m_value; }
- double milliseconds() const { return seconds() * 1000; }
- double microseconds() const { return milliseconds() * 1000; }
- double nanoseconds() const { return microseconds() * 1000; }
</del><ins>+ constexpr double minutes() const { return m_value / 60; }
+ constexpr double seconds() const { return m_value; }
+ constexpr double milliseconds() const { return seconds() * 1000; }
+ constexpr double microseconds() const { return milliseconds() * 1000; }
+ constexpr double nanoseconds() const { return microseconds() * 1000; }
</ins><span class="cx">
</span><span class="cx"> // Keep in mind that Seconds is held in double. If the value is not in range of 53bit integer, the result may not be precise.
</span><span class="cx"> template<typename T> T minutesAs() const { static_assert(std::is_integral<T>::value, ""); return clampToAccepting64<T>(minutes()); }
</span><span class="lines">@@ -89,19 +89,19 @@
</span><span class="cx"> return Seconds(std::numeric_limits<double>::infinity());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- explicit operator bool() const { return !!m_value; }
</del><ins>+ explicit constexpr operator bool() const { return !!m_value; }
</ins><span class="cx">
</span><del>- Seconds operator+(Seconds other) const
</del><ins>+ constexpr Seconds operator+(Seconds other) const
</ins><span class="cx"> {
</span><span class="cx"> return Seconds(value() + other.value());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Seconds operator-(Seconds other) const
</del><ins>+ constexpr Seconds operator-(Seconds other) const
</ins><span class="cx"> {
</span><span class="cx"> return Seconds(value() - other.value());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Seconds operator-() const
</del><ins>+ constexpr Seconds operator-() const
</ins><span class="cx"> {
</span><span class="cx"> return Seconds(-value());
</span><span class="cx"> }
</span><span class="lines">@@ -108,18 +108,18 @@
</span><span class="cx">
</span><span class="cx"> // It makes sense to consider scaling a duration, like, "I want to wait 5 times as long as
</span><span class="cx"> // last time!".
</span><del>- Seconds operator*(double scalar) const
</del><ins>+ constexpr Seconds operator*(double scalar) const
</ins><span class="cx"> {
</span><span class="cx"> return Seconds(value() * scalar);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Seconds operator/(double scalar) const
</del><ins>+ constexpr Seconds operator/(double scalar) const
</ins><span class="cx"> {
</span><span class="cx"> return Seconds(value() / scalar);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // It's reasonable to think about ratios between Seconds.
</span><del>- double operator/(Seconds other) const
</del><ins>+ constexpr double operator/(Seconds other) const
</ins><span class="cx"> {
</span><span class="cx"> return value() / other.value();
</span><span class="cx"> }
</span><span class="lines">@@ -177,32 +177,32 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE MonotonicTime operator-(MonotonicTime) const;
</span><span class="cx"> WTF_EXPORT_PRIVATE TimeWithDynamicClockType operator-(const TimeWithDynamicClockType&) const;
</span><span class="cx">
</span><del>- bool operator==(Seconds other) const
</del><ins>+ constexpr bool operator==(Seconds other) const
</ins><span class="cx"> {
</span><span class="cx"> return m_value == other.m_value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool operator!=(Seconds other) const
</del><ins>+ constexpr bool operator!=(Seconds other) const
</ins><span class="cx"> {
</span><span class="cx"> return m_value != other.m_value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool operator<(Seconds other) const
</del><ins>+ constexpr bool operator<(Seconds other) const
</ins><span class="cx"> {
</span><span class="cx"> return m_value < other.m_value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool operator>(Seconds other) const
</del><ins>+ constexpr bool operator>(Seconds other) const
</ins><span class="cx"> {
</span><span class="cx"> return m_value > other.m_value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool operator<=(Seconds other) const
</del><ins>+ constexpr bool operator<=(Seconds other) const
</ins><span class="cx"> {
</span><span class="cx"> return m_value <= other.m_value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool operator>=(Seconds other) const
</del><ins>+ constexpr bool operator>=(Seconds other) const
</ins><span class="cx"> {
</span><span class="cx"> return m_value >= other.m_value;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (215168 => 215169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-09 23:47:14 UTC (rev 215168)
+++ trunk/Source/WebCore/ChangeLog 2017-04-10 02:41:04 UTC (rev 215169)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2017-04-09 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ [WTF] Annotate Seconds' member functions and operators with constexpr
+ https://bugs.webkit.org/show_bug.cgi?id=170662
+
+ Reviewed by Daniel Bates.
+
+ * page/Frame.cpp:
+
</ins><span class="cx"> 2017-04-09 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop Timer::startRepeating() overload taking a double
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (215168 => 215169)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2017-04-09 23:47:14 UTC (rev 215168)
+++ trunk/Source/WebCore/page/Frame.cpp 2017-04-10 02:41:04 UTC (rev 215169)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-static const Seconds scrollFrequency { 1000 / 60. };
</del><ins>+static const Seconds scrollFrequency { 1000_s / 60. };
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, frameCounter, ("Frame"));
</span></span></pre>
</div>
</div>
</body>
</html>