<!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>[208979] 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/208979">208979</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-11-26 15:21:39 -0800 (Sat, 26 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add literals for various time units
https://bugs.webkit.org/show_bug.cgi?id=165074
Reviewed by Filip Pizlo.
Source/WTF:
Add _min, _s, _ms, _us and _ns literals for easy creation of Seconds from long double
and unsigned long long types (those allowed for custom literals).
Add minutes-related functions (there are one or two use cases in WebCore).
* wtf/Seconds.h:
(WTF::Seconds::minutes):
(WTF::Seconds::fromMinutes):
(WTF::Seconds::fromMilliseconds):
(WTF::Seconds::fromMicroseconds):
(WTF::Seconds::fromNanoseconds):
(WTF::operator _min):
(WTF::operator _s):
(WTF::operator _ms):
(WTF::operator _us):
(WTF::operator _ns):
Tools:
Add tests for new time literals. Add new tests for units.
* TestWebKitAPI/Tests/WTF/Time.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfSecondsh">trunk/Source/WTF/wtf/Seconds.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFTimecpp">trunk/Tools/TestWebKitAPI/Tests/WTF/Time.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (208978 => 208979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-11-26 00:17:19 UTC (rev 208978)
+++ trunk/Source/WTF/ChangeLog 2016-11-26 23:21:39 UTC (rev 208979)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-11-26 Simon Fraser <simon.fraser@apple.com>
+
+ Add literals for various time units
+ https://bugs.webkit.org/show_bug.cgi?id=165074
+
+ Reviewed by Filip Pizlo.
+
+ Add _min, _s, _ms, _us and _ns literals for easy creation of Seconds from long double
+ and unsigned long long types (those allowed for custom literals).
+
+ Add minutes-related functions (there are one or two use cases in WebCore).
+
+ * wtf/Seconds.h:
+ (WTF::Seconds::minutes):
+ (WTF::Seconds::fromMinutes):
+ (WTF::Seconds::fromMilliseconds):
+ (WTF::Seconds::fromMicroseconds):
+ (WTF::Seconds::fromNanoseconds):
+ (WTF::operator _min):
+ (WTF::operator _s):
+ (WTF::operator _ms):
+ (WTF::operator _us):
+ (WTF::operator _ns):
+
</ins><span class="cx"> 2016-11-22 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> One more tiny bit of follow-up.
</span></span></pre></div>
<a id="trunkSourceWTFwtfSecondsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Seconds.h (208978 => 208979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Seconds.h 2016-11-26 00:17:19 UTC (rev 208978)
+++ trunk/Source/WTF/wtf/Seconds.h 2016-11-26 23:21:39 UTC (rev 208979)
</span><span class="lines">@@ -46,24 +46,30 @@
</span><span class="cx">
</span><span class="cx"> double value() const { return m_value; }
</span><span class="cx">
</span><ins>+ double minutes() const { return m_value / 60; }
</ins><span class="cx"> double seconds() const { return m_value; }
</span><span class="cx"> double milliseconds() const { return seconds() * 1000; }
</span><span class="cx"> double microseconds() const { return milliseconds() * 1000; }
</span><span class="cx"> double nanoseconds() const { return microseconds() * 1000; }
</span><span class="cx">
</span><del>- static constexpr Seconds fromMilliseconds(double value)
</del><ins>+ static constexpr Seconds fromMinutes(double minutes)
</ins><span class="cx"> {
</span><del>- return Seconds(value / 1000);
</del><ins>+ return Seconds(minutes * 60);
</ins><span class="cx"> }
</span><ins>+
+ static constexpr Seconds fromMilliseconds(double milliseconds)
+ {
+ return Seconds(milliseconds / 1000);
+ }
</ins><span class="cx">
</span><del>- static constexpr Seconds fromMicroseconds(double value)
</del><ins>+ static constexpr Seconds fromMicroseconds(double microseconds)
</ins><span class="cx"> {
</span><del>- return fromMilliseconds(value / 1000);
</del><ins>+ return fromMilliseconds(microseconds / 1000);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- static constexpr Seconds fromNanoseconds(double value)
</del><ins>+ static constexpr Seconds fromNanoseconds(double nanoseconds)
</ins><span class="cx"> {
</span><del>- return fromMicroseconds(value / 1000);
</del><ins>+ return fromMicroseconds(nanoseconds / 1000);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static constexpr Seconds infinity()
</span><span class="lines">@@ -195,6 +201,56 @@
</span><span class="cx"> double m_value { 0 };
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+constexpr Seconds operator"" _min(long double minutes)
+{
+ return Seconds::fromMinutes(minutes);
+}
+
+constexpr Seconds operator"" _s(long double seconds)
+{
+ return Seconds(seconds);
+}
+
+constexpr Seconds operator"" _ms(long double milliseconds)
+{
+ return Seconds::fromMilliseconds(milliseconds);
+}
+
+constexpr Seconds operator"" _us(long double microseconds)
+{
+ return Seconds::fromMicroseconds(microseconds);
+}
+
+constexpr Seconds operator"" _ns(long double nanoseconds)
+{
+ return Seconds::fromNanoseconds(nanoseconds);
+}
+
+constexpr Seconds operator"" _min(unsigned long long minutes)
+{
+ return Seconds::fromMinutes(minutes);
+}
+
+constexpr Seconds operator"" _s(unsigned long long seconds)
+{
+ return Seconds(seconds);
+}
+
+constexpr Seconds operator"" _ms(unsigned long long milliseconds)
+{
+ return Seconds::fromMilliseconds(milliseconds);
+}
+
+constexpr Seconds operator"" _us(unsigned long long microseconds)
+{
+ return Seconds::fromMicroseconds(microseconds);
+}
+
+constexpr Seconds operator"" _ns(unsigned long long nanoseconds)
+{
+ return Seconds::fromNanoseconds(nanoseconds);
+}
+
</ins><span class="cx"> WTF_EXPORT_PRIVATE void sleep(Seconds);
</span><span class="cx">
</span><span class="cx"> } // namespae WTF
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (208978 => 208979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-11-26 00:17:19 UTC (rev 208978)
+++ trunk/Tools/ChangeLog 2016-11-26 23:21:39 UTC (rev 208979)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-11-26 Simon Fraser <simon.fraser@apple.com>
+
+ Add literals for various time units
+ https://bugs.webkit.org/show_bug.cgi?id=165074
+
+ Reviewed by Filip Pizlo.
+
+ Add tests for new time literals. Add new tests for units.
+
+ * TestWebKitAPI/Tests/WTF/Time.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-11-25 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix compile warnings after r208415
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFTimecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/Time.cpp (208978 => 208979)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/Time.cpp 2016-11-26 00:17:19 UTC (rev 208978)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/Time.cpp 2016-11-26 23:21:39 UTC (rev 208979)
</span><span class="lines">@@ -97,6 +97,20 @@
</span><span class="cx">
</span><span class="cx"> } // anonymous namespace
</span><span class="cx">
</span><ins>+TEST(WTF_Time, units)
+{
+ EXPECT_EQ(s(60), Seconds::fromMinutes(1));
+ EXPECT_EQ(s(0.001), Seconds::fromMilliseconds(1));
+ EXPECT_EQ(s(0.000001), Seconds::fromMicroseconds(1));
+ EXPECT_EQ(s(0.0000005), Seconds::fromNanoseconds(500));
+
+ EXPECT_EQ(s(120).minutes(), 2);
+ EXPECT_EQ(s(2).seconds(), 2);
+ EXPECT_EQ(s(2).milliseconds(), 2000);
+ EXPECT_EQ(s(2).microseconds(), 2000000);
+ EXPECT_EQ(s(2).nanoseconds(), 2000000000);
+}
+
</ins><span class="cx"> TEST(WTF_Time, plus)
</span><span class="cx"> {
</span><span class="cx"> EXPECT_EQ(s(6), s(1) + s(5));
</span><span class="lines">@@ -279,5 +293,26 @@
</span><span class="cx"> EXPECT_TRUE(dtm(2) != dtm(3));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(WTF_Time, literals)
+{
+ EXPECT_TRUE(s(120) == 2_min);
+ EXPECT_TRUE(s(2) == 2_s);
+ EXPECT_TRUE(s(2) == 2000_ms);
+ EXPECT_TRUE(s(2) - 1000_ms == s(1));
+ EXPECT_TRUE(2_s - s(1) == 1000_ms);
+
+ EXPECT_TRUE(Seconds::fromMinutes(2) == 2_min);
+ EXPECT_TRUE(Seconds(2) == 2_s);
+ EXPECT_TRUE(Seconds::fromMilliseconds(2) == 2_ms);
+ EXPECT_TRUE(Seconds::fromMicroseconds(2) == 2_us);
+ EXPECT_TRUE(Seconds::fromNanoseconds(2) == 2_ns);
+
+ EXPECT_TRUE(Seconds::fromMinutes(2.5) == 2.5_min);
+ EXPECT_TRUE(Seconds(2.5) == 2.5_s);
+ EXPECT_TRUE(Seconds::fromMilliseconds(2.5) == 2.5_ms);
+ EXPECT_TRUE(Seconds::fromMicroseconds(2.5) == 2.5_us);
+ EXPECT_TRUE(Seconds::fromNanoseconds(2.5) == 2.5_ns);
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>