<!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>[213328] tags/Safari-604.1.8</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/213328">213328</a></dd>
<dt>Author</dt> <dd>jmarcell@apple.com</dd>
<dt>Date</dt> <dd>2017-03-02 17:08:05 -0800 (Thu, 02 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213324">r213324</a>. rdar://problem/30812277</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari60418SourceWTFChangeLog">tags/Safari-604.1.8/Source/WTF/ChangeLog</a></li>
<li><a href="#tagsSafari60418SourceWTFwtfMediaTimecpp">tags/Safari-604.1.8/Source/WTF/wtf/MediaTime.cpp</a></li>
<li><a href="#tagsSafari60418ToolsChangeLog">tags/Safari-604.1.8/Tools/ChangeLog</a></li>
<li><a href="#tagsSafari60418ToolsTestWebKitAPITestsWTFMediaTimecpp">tags/Safari-604.1.8/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari60418SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.8/Source/WTF/ChangeLog (213327 => 213328)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.8/Source/WTF/ChangeLog 2017-03-03 01:07:59 UTC (rev 213327)
+++ tags/Safari-604.1.8/Source/WTF/ChangeLog 2017-03-03 01:08:05 UTC (rev 213328)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-02 Jason Marcell <jmarcell@apple.com>
+
+ Merge r213324. rdar://problem/30812277
+
+ 2017-03-02 Jer Noble <jer.noble@apple.com>
+
+ Sufficently large timeValue and timeScale arguments to MediaTime will cause wrapping in toTimeScale().
+ https://bugs.webkit.org/show_bug.cgi?id=169098
+
+ Reviewed by Keith Miller.
+
+ Use a non-standard but Clang & GCC supported __int128_t type extension to do the 128-bit math rather than
+ rolling our own. Since this is only available in 64-bit builds, for 32-bit, just fix the underlying 128-bit
+ math.
+
+ * wtf/MediaTime.cpp:
+ (WTF::MediaTime::setTimeScale):
+
</ins><span class="cx"> 2017-03-01 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Move MemoryPressureHandler to WTF
</span></span></pre></div>
<a id="tagsSafari60418SourceWTFwtfMediaTimecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.8/Source/WTF/wtf/MediaTime.cpp (213327 => 213328)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.8/Source/WTF/wtf/MediaTime.cpp 2017-03-03 01:07:59 UTC (rev 213327)
+++ tags/Safari-604.1.8/Source/WTF/wtf/MediaTime.cpp 2017-03-03 01:08:05 UTC (rev 213328)
</span><span class="lines">@@ -489,34 +489,31 @@
</span><span class="cx">
</span><span class="cx"> timeScale = std::min(MaximumTimeScale, timeScale);
</span><span class="cx">
</span><del>- int64_t newValue = 0;
- int64_t remainder = 0;
- if (safeMultiply(m_timeValue, static_cast<int64_t>(timeScale), newValue)) {
- remainder = newValue % m_timeScale;
- newValue = newValue / m_timeScale;
- } else {
- int64_t highPart = (m_timeValue >> 32) * timeScale;
- int64_t highRemainder = highPart % m_timeScale;
- highPart /= m_timeScale;
</del><ins>+#if CPU(X86_64) || CPU(ARM64)
+ __int128_t newValue = static_cast<__int128_t>(m_timeValue) * timeScale;
+ int64_t remainder = newValue % m_timeScale;
+ newValue = newValue / m_timeScale;
</ins><span class="cx">
</span><del>- int64_t lowPart = (m_timeValue & 0xFFFFFFFF) * timeScale + highRemainder;
- highPart += (lowPart >> 32);
- lowPart &= 0xFFFFFFFF;
- remainder = lowPart % m_timeScale;
- lowPart /= m_timeScale;
</del><ins>+ if (newValue < std::numeric_limits<int64_t>::min()) {
+ *this = negativeInfiniteTime();
+ return;
+ }
</ins><span class="cx">
</span><del>- if (highPart < std::numeric_limits<int32_t>::min()) {
- *this = negativeInfiniteTime();
- return;
- }
</del><ins>+ if (newValue > std::numeric_limits<int64_t>::max()) {
+ *this = positiveInfiniteTime();
+ return;
+ }
+#else
+ int64_t newValue = m_timeValue / m_timeScale;
+ int64_t partialRemainder = (m_timeValue % m_timeScale) * timeScale;
+ int64_t remainder = partialRemainder % m_timeScale;
</ins><span class="cx">
</span><del>- if (highPart > std::numeric_limits<int32_t>::max()) {
- *this = positiveInfiniteTime();
- return;
- }
-
- newValue = (highPart << 32) + lowPart;
</del><ins>+ if (!safeMultiply<int64_t>(newValue, static_cast<int64_t>(timeScale), newValue)
+ || !safeAdd(newValue, partialRemainder / m_timeScale, newValue)) {
+ *this = newValue < 0 ? negativeInfiniteTime() : positiveInfiniteTime();
+ return;
</ins><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> m_timeValue = newValue;
</span><span class="cx"> std::swap(m_timeScale, timeScale);
</span></span></pre></div>
<a id="tagsSafari60418ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.8/Tools/ChangeLog (213327 => 213328)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.8/Tools/ChangeLog 2017-03-03 01:07:59 UTC (rev 213327)
+++ tags/Safari-604.1.8/Tools/ChangeLog 2017-03-03 01:08:05 UTC (rev 213328)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-02 Jason Marcell <jmarcell@apple.com>
+
+ Merge r213324. rdar://problem/30812277
+
+ 2017-03-02 Jer Noble <jer.noble@apple.com>
+
+ Sufficently large timeValue and timeScale arguments to MediaTime will cause wrapping in toTimeScale().
+ https://bugs.webkit.org/show_bug.cgi?id=169098
+
+ Reviewed by Keith Miller.
+
+ * TestWebKitAPI/Tests/WTF/MediaTime.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2017-02-28 Srinivasan Vijayaraghavan <svijayaraghavan@apple.com>
</span><span class="cx">
</span><span class="cx"> Add ability for webkitpy to run bindings tests
</span></span></pre></div>
<a id="tagsSafari60418ToolsTestWebKitAPITestsWTFMediaTimecpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-604.1.8/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp (213327 => 213328)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-604.1.8/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp 2017-03-03 01:07:59 UTC (rev 213327)
+++ tags/Safari-604.1.8/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp 2017-03-03 01:08:05 UTC (rev 213328)
</span><span class="lines">@@ -279,6 +279,13 @@
</span><span class="cx"> EXPECT_EQ(MediaTime(numeric_limits<int64_t>::min(), 1).toTimeScale(2), MediaTime::negativeInfiniteTime());
</span><span class="cx"> int64_t maxInt32 = numeric_limits<int32_t>::max();
</span><span class="cx"> EXPECT_EQ(MediaTime(maxInt32 * 2, 1).toTimeScale(2).timeValue(), maxInt32 * 4);
</span><ins>+ int64_t bigInt = 1LL << 62;
+ EXPECT_EQ(MediaTime(bigInt, 1U << 31).toTimeScale(1U << 30).timeValue(), bigInt / 2);
+ EXPECT_EQ(MediaTime(bigInt + 1, 1U << 31).toTimeScale(1U << 30, MediaTime::RoundingFlags::TowardZero).timeValue(), bigInt / 2);
+ EXPECT_EQ(MediaTime(bigInt + 1, 1U << 31).toTimeScale(1U << 30).hasBeenRounded(), true);
+ EXPECT_EQ(MediaTime(bigInt - 2, MediaTime::MaximumTimeScale).toTimeScale(MediaTime::MaximumTimeScale - 1).hasBeenRounded(), true);
+ EXPECT_EQ(MediaTime(bigInt, 1).toTimeScale(MediaTime::MaximumTimeScale), MediaTime::positiveInfiniteTime());
+ EXPECT_EQ(MediaTime(-bigInt, 1).toTimeScale(MediaTime::MaximumTimeScale), MediaTime::negativeInfiniteTime());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>