<!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>[206032] 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/206032">206032</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2016-09-16 11:04:54 -0700 (Fri, 16 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[media-source] fix imported/w3c/web-platform-tests/media-source/mediasource-duration.html
https://bugs.webkit.org/show_bug.cgi?id=161999
Reviewed by Eric Carlson.
LayoutTests/imported/w3c:
Expected results had a stray newline.
* web-platform-tests/media-source/mediasource-duration-expected.txt:
Source/WTF:
The mediasource-duration.html test tries to set the duration of a MediaSource to a double value
(5.0), then some work happens and the duration is set to a media time (12533/2500, or 5.0132).
The test then tries to set that value as the duration, converted from a media time to a double,
and asserts that no duration change event is fired. But because the floating point value and the
media time value are ever so slightly different, this round-tripping fails.
Fix this bug in MediaTime by, when one side or the other of a comparison is a floating point
MediaTime, convert both sides to doubles and run the comparison against those values. This preserves
the transitive equality of doubles <-> MediaTimes.
* wtf/MediaTime.cpp:
(WTF::MediaTime::compare):
Tools:
* TestWebKitAPI/Tests/WTF/MediaTime.cpp:
(TestWebKitAPI::TEST):
LayoutTests:
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsmediasourcemediasourcedurationexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/media-source/mediasource-duration-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfMediaTimecpp">trunk/Source/WTF/wtf/MediaTime.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFMediaTimecpp">trunk/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206031 => 206032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-16 17:46:51 UTC (rev 206031)
+++ trunk/LayoutTests/ChangeLog 2016-09-16 18:04:54 UTC (rev 206032)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-09-14 Jer Noble <jer.noble@apple.com>
+
+ [media-source] fix imported/w3c/web-platform-tests/media-source/mediasource-duration.html
+ https://bugs.webkit.org/show_bug.cgi?id=161999
+
+ Reviewed by Eric Carlson.
+
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2016-09-16 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [media-source] Fix imported/w3c/web-platform-tests/media-source/mediasource-timestamp-offset.html
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (206031 => 206032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-16 17:46:51 UTC (rev 206031)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-09-16 18:04:54 UTC (rev 206032)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-09-14 Jer Noble <jer.noble@apple.com>
+
+ [media-source] fix imported/w3c/web-platform-tests/media-source/mediasource-duration.html
+ https://bugs.webkit.org/show_bug.cgi?id=161999
+
+ Reviewed by Eric Carlson.
+
+ Expected results had a stray newline.
+
+ * web-platform-tests/media-source/mediasource-duration-expected.txt:
+
</ins><span class="cx"> 2016-09-16 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Cloning a textarea does not clone the textarea's value
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsmediasourcemediasourcedurationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/media-source/mediasource-duration-expected.txt (206031 => 206032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/media-source/mediasource-duration-expected.txt 2016-09-16 17:46:51 UTC (rev 206031)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/media-source/mediasource-duration-expected.txt 2016-09-16 18:04:54 UTC (rev 206032)
</span><span class="lines">@@ -4,3 +4,4 @@
</span><span class="cx"> PASS Test endOfStream completes previous seek to truncated duration
</span><span class="cx"> PASS Test setting same duration multiple times does not fire duplicate durationchange
</span><span class="cx"> PASS Test setting the duration to less than the highest starting presentation timestamp will throw
</span><ins>+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (206031 => 206032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-09-16 17:46:51 UTC (rev 206031)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-09-16 18:04:54 UTC (rev 206032)
</span><span class="lines">@@ -1049,6 +1049,7 @@
</span><span class="cx"> [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-addsourcebuffer.html [ Pass ]
</span><span class="cx"> [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-closed.html [ Pass ]
</span><span class="cx"> [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-config-change-mp4-v-bitrate.html [ Pass ]
</span><ins>+[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-duration.html [ Pass ]
</ins><span class="cx"> [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-endofstream-invaliderror.html [ Pass ]
</span><span class="cx"> [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-multiple-attach.html [ Pass ]
</span><span class="cx"> [ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-play.html [ Pass ]
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (206031 => 206032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-09-16 17:46:51 UTC (rev 206031)
+++ trunk/Source/WTF/ChangeLog 2016-09-16 18:04:54 UTC (rev 206032)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-09-14 Jer Noble <jer.noble@apple.com>
+
+ [media-source] fix imported/w3c/web-platform-tests/media-source/mediasource-duration.html
+ https://bugs.webkit.org/show_bug.cgi?id=161999
+
+ Reviewed by Eric Carlson.
+
+ The mediasource-duration.html test tries to set the duration of a MediaSource to a double value
+ (5.0), then some work happens and the duration is set to a media time (12533/2500, or 5.0132).
+ The test then tries to set that value as the duration, converted from a media time to a double,
+ and asserts that no duration change event is fired. But because the floating point value and the
+ media time value are ever so slightly different, this round-tripping fails.
+
+ Fix this bug in MediaTime by, when one side or the other of a comparison is a floating point
+ MediaTime, convert both sides to doubles and run the comparison against those values. This preserves
+ the transitive equality of doubles <-> MediaTimes.
+
+ * wtf/MediaTime.cpp:
+ (WTF::MediaTime::compare):
+
</ins><span class="cx"> 2016-09-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix isValidEnum to work with older versions of GCC
</span></span></pre></div>
<a id="trunkSourceWTFwtfMediaTimecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MediaTime.cpp (206031 => 206032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MediaTime.cpp 2016-09-16 17:46:51 UTC (rev 206031)
+++ trunk/Source/WTF/wtf/MediaTime.cpp 2016-09-16 18:04:54 UTC (rev 206032)
</span><span class="lines">@@ -407,15 +407,19 @@
</span><span class="cx"> return m_timeValueAsDouble < rhs.m_timeValueAsDouble ? LessThan : GreaterThan;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (hasDoubleValue() || rhs.hasDoubleValue()) {
+ double a = toDouble();
+ double b = rhs.toDouble();
+ if (a > b)
+ return GreaterThan;
+ if (a < b)
+ return LessThan;
+ return EqualTo;
+ }
+
</ins><span class="cx"> MediaTime a = *this;
</span><span class="cx"> MediaTime b = rhs;
</span><span class="cx">
</span><del>- if (a.hasDoubleValue())
- a.setTimeScale(DefaultTimeScale);
-
- if (b.hasDoubleValue())
- b.setTimeScale(DefaultTimeScale);
-
</del><span class="cx"> int64_t rhsWhole = b.m_timeValue / b.m_timeScale;
</span><span class="cx"> int64_t lhsWhole = a.m_timeValue / a.m_timeScale;
</span><span class="cx"> if (lhsWhole > rhsWhole)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (206031 => 206032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-16 17:46:51 UTC (rev 206031)
+++ trunk/Tools/ChangeLog 2016-09-16 18:04:54 UTC (rev 206032)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-09-14 Jer Noble <jer.noble@apple.com>
+
+ [media-source] fix imported/w3c/web-platform-tests/media-source/mediasource-duration.html
+ https://bugs.webkit.org/show_bug.cgi?id=161999
+
+ Reviewed by Eric Carlson.
+
+ * TestWebKitAPI/Tests/WTF/MediaTime.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-09-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix isValidEnum to work with older versions of GCC
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFMediaTimecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp (206031 => 206032)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp 2016-09-16 17:46:51 UTC (rev 206031)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/MediaTime.cpp 2016-09-16 18:04:54 UTC (rev 206032)
</span><span class="lines">@@ -185,6 +185,7 @@
</span><span class="cx"> // Floating Point Round Trip
</span><span class="cx"> EXPECT_EQ(10.0123456789f, MediaTime::createWithFloat(10.0123456789f).toFloat());
</span><span class="cx"> EXPECT_EQ(10.0123456789, MediaTime::createWithDouble(10.0123456789).toDouble());
</span><ins>+ EXPECT_EQ(MediaTime(1, 3), MediaTime::createWithDouble(MediaTime(1, 3).toDouble()));
</ins><span class="cx">
</span><span class="cx"> // Floating Point Math
</span><span class="cx"> EXPECT_EQ(1.5 + 3.3, (MediaTime::createWithDouble(1.5) + MediaTime::createWithDouble(3.3)).toDouble());
</span></span></pre>
</div>
</div>
</body>
</html>