<!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>[195703] branches/safari-601.1.46-branch</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/195703">195703</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-01-27 16:02:14 -0800 (Wed, 27 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/195671">r195671</a>. rdar://problem/24302956</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs">branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsmediamediacontrolsdragtimelinesetcontrolspropertyexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/media/media-controls-drag-timeline-set-controls-property-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsmediamediacontrolsdragtimelinesetcontrolspropertyhtml">branches/safari-601.1.46-branch/LayoutTests/media/media-controls-drag-timeline-set-controls-property.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (195702 => 195703)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-27 23:55:43 UTC (rev 195702)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-28 00:02:14 UTC (rev 195703)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-27 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r195671.
+
+ 2016-01-26 Jer Noble <jer.noble@apple.com>
+
+ Calling video.controls=true during a scrub operation cancels scrub.
+ https://bugs.webkit.org/show_bug.cgi?id=153494
+
+ Reviewed by Eric Carlson.
+
+ * media/media-controls-drag-timeline-set-controls-property-expected.txt: Added.
+ * media/media-controls-drag-timeline-set-controls-property.html: Added.
+
</ins><span class="cx"> 2016-01-20 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Re-enable synchronous popstate event for safari-601-branch
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsmediamediacontrolsdragtimelinesetcontrolspropertyexpectedtxtfromrev195671trunkLayoutTestsmediamediacontrolsdragtimelinesetcontrolspropertyexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/media/media-controls-drag-timeline-set-controls-property-expected.txt (from rev 195671, trunk/LayoutTests/media/media-controls-drag-timeline-set-controls-property-expected.txt) (0 => 195703)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/media/media-controls-drag-timeline-set-controls-property-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/media/media-controls-drag-timeline-set-controls-property-expected.txt 2016-01-28 00:02:14 UTC (rev 195703)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Test that dragging the timeline slider after setting video.controls=true causes seeks.
+
+
+EVENT(playing)
+EVENT(pause)
+EVENT(seeked)
+EVENT(seeked)
+EVENT(seeked)
+END OF TEST
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsmediamediacontrolsdragtimelinesetcontrolspropertyhtmlfromrev195671trunkLayoutTestsmediamediacontrolsdragtimelinesetcontrolspropertyhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/media/media-controls-drag-timeline-set-controls-property.html (from rev 195671, trunk/LayoutTests/media/media-controls-drag-timeline-set-controls-property.html) (0 => 195703)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/media/media-controls-drag-timeline-set-controls-property.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/media/media-controls-drag-timeline-set-controls-property.html 2016-01-28 00:02:14 UTC (rev 195703)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>media-controls-timeline-set-controls-property</title>
+ <script src="media-controls.js"></script>
+ <script src="media-file.js"></script>
+ <script src="video-test.js"></script>
+ <script>
+ var x;
+ var y;
+ var seekCount = 0;
+ var moveInterval;
+
+ function runTest()
+ {
+ findMediaElement();
+ waitForEvent('playing', beginScrubbing);
+ video.src = findMediaFile('video', 'content/test');
+ video.play();
+ }
+
+ function beginScrubbing()
+ {
+ if (window.eventSender) {
+
+ var timelineCoordinate;
+ try {
+ timelineCoordinate = mediaControlsButtonCoordinates(video, 'timeline');
+ } catch (exception) {
+ failTest(exception.description);
+ return;
+ }
+ x = timelineCoordinate[0];
+ y = timelineCoordinate[1];
+
+ eventSender.dragMode = false;
+ eventSender.mouseMoveTo(x, y);
+ eventSender.mouseDown();
+ }
+ waitForEvent('pause', pause);
+ waitForEvent('seeked', seeked)
+ }
+
+ function pause()
+ {
+ video.controls = 'true';
+ moveInterval = setInterval(move, 100);
+ }
+
+ function move()
+ {
+ if (window.eventSender) {
+ x += 10;
+ eventSender.mouseMoveTo(x, y);
+ }
+ }
+
+
+ function seeked()
+ {
+ ++seekCount;
+ if (seekCount < 3)
+ return;
+
+ clearInterval(moveInterval);
+ if (window.eventSender)
+ eventSender.mouseUp();
+ endTest();
+ }
+
+
+ </script>
+</head>
+
+<body onload="runTest()">
+ <p>Test that dragging the timeline slider after setting video.controls=true causes seeks.</p>
+ <video controls></video>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (195702 => 195703)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-27 23:55:43 UTC (rev 195702)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-28 00:02:14 UTC (rev 195703)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-01-27 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r195671.
+
+ 2016-01-26 Jer Noble <jer.noble@apple.com>
+
+ Calling video.controls=true during a scrub operation cancels scrub.
+ https://bugs.webkit.org/show_bug.cgi?id=153494
+
+ Reviewed by Eric Carlson.
+
+ Test: media/media-controls-drag-timeline-set-controls-property.html
+
+ Verify that the video.controls attribute actually changed before tearing down and
+ re-adding the media controls to the Shadow DOM.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.handleControlsChange):
+ (Controller.prototype.hasControls):
+
</ins><span class="cx"> 2016-01-26 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r195606. rdar://problem/24243317
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (195702 => 195703)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-01-27 23:55:43 UTC (rev 195702)
+++ branches/safari-601.1.46-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2016-01-28 00:02:14 UTC (rev 195703)
</span><span class="lines">@@ -1080,9 +1080,9 @@
</span><span class="cx"> try {
</span><span class="cx"> this.updateBase();
</span><span class="cx">
</span><del>- if (this.shouldHaveControls())
</del><ins>+ if (this.shouldHaveControls() && !this.hasControls())
</ins><span class="cx"> this.addControls();
</span><del>- else
</del><ins>+ else if (!this.shouldHaveControls() && this.hasControls())
</ins><span class="cx"> this.removeControls();
</span><span class="cx"> } catch(e) {
</span><span class="cx"> if (window.console)
</span><span class="lines">@@ -1535,6 +1535,11 @@
</span><span class="cx"> this.updateControls();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ hasControls: function()
+ {
+ return this.controls.panel.parentElement;
+ },
+
</ins><span class="cx"> updateTime: function()
</span><span class="cx"> {
</span><span class="cx"> var currentTime = this.video.currentTime;
</span></span></pre>
</div>
</div>
</body>
</html>