<!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>[184609] trunk/Source/WebCore</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/184609">184609</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-19 18:48:33 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/184595">r184595</a>.
https://bugs.webkit.org/show_bug.cgi?id=145197
Introduced a crash in 15 layout tests on Mavericks on #webkit
(Requested by rniwa on #webkit).
Reverted changeset:
"Media Controls stop updating after hovering for a few
seconds."
https://bugs.webkit.org/show_bug.cgi?id=144770
http://trac.webkit.org/changeset/184595</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184608 => 184609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-20 01:19:41 UTC (rev 184608)
+++ trunk/Source/WebCore/ChangeLog 2015-05-20 01:48:33 UTC (rev 184609)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-19 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r184595.
+ https://bugs.webkit.org/show_bug.cgi?id=145197
+
+ Introduced a crash in 15 layout tests on Mavericks on #webkit
+ (Requested by rniwa on #webkit).
+
+ Reverted changeset:
+
+ "Media Controls stop updating after hovering for a few
+ seconds."
+ https://bugs.webkit.org/show_bug.cgi?id=144770
+ http://trac.webkit.org/changeset/184595
+
</ins><span class="cx"> 2015-05-19 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r181571): Build broken when USE(OPENGL_ES_2) is defined.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (184608 => 184609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-20 01:19:41 UTC (rev 184608)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-05-20 01:48:33 UTC (rev 184609)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> var base = this.base = document.createElement('div');
</span><span class="cx"> base.setAttribute('pseudo', '-webkit-media-controls');
</span><span class="cx"> this.listenFor(base, 'mousemove', this.handleWrapperMouseMove);
</span><del>- this.listenFor(this.video, 'mouseout', this.handleWrapperMouseOut);
</del><ins>+ this.listenFor(base, 'mouseout', this.handleWrapperMouseOut);
</ins><span class="cx"> if (this.host.textTrackContainer)
</span><span class="cx"> base.appendChild(this.host.textTrackContainer);
</span><span class="cx"> },
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx">
</span><span class="cx"> updateTimelineMetricsIfNeeded: function()
</span><span class="cx"> {
</span><del>- if (this.timelineMetricsNeedsUpdate && !this.controlsAreHidden()) {
</del><ins>+ if (this.timelineMetricsNeedsUpdate) {
</ins><span class="cx"> this.timelineLeft = this.controls.timeline.offsetLeft;
</span><span class="cx"> this.timelineWidth = this.controls.timeline.offsetWidth;
</span><span class="cx"> this.timelineHeight = this.controls.timeline.offsetHeight;
</span><span class="lines">@@ -682,8 +682,8 @@
</span><span class="cx"> handleDurationChange: function(event)
</span><span class="cx"> {
</span><span class="cx"> this.updateDuration();
</span><del>- this.updateTime();
- this.updateProgress();
</del><ins>+ this.updateTime(true);
+ this.updateProgress(true);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handlePlay: function(event)
</span><span class="lines">@@ -816,9 +816,14 @@
</span><span class="cx"> handlePanelTransitionEnd: function(event)
</span><span class="cx"> {
</span><span class="cx"> var opacity = window.getComputedStyle(this.controls.panel).opacity;
</span><del>- if (!parseInt(opacity) && !this.controlsAlwaysVisible()) {
- this.base.removeChild(this.controls.inlinePlaybackPlaceholder);
- this.base.removeChild(this.controls.panel);
</del><ins>+ if (parseInt(opacity) > 0) {
+ this.controls.panel.classList.remove(this.ClassNames.hidden);
+ if (this.controls.panelBackground)
+ this.controls.panelBackground.classList.remove(this.ClassNames.hidden);
+ } else if (!this.controlsAlwaysVisible()) {
+ this.controls.panel.classList.add(this.ClassNames.hidden);
+ if (this.controls.panelBackground)
+ this.controls.panelBackground.classList.add(this.ClassNames.hidden);
</ins><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -1142,8 +1147,11 @@
</span><span class="cx"> return gradient;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- updateProgress: function()
</del><ins>+ updateProgress: function(forceUpdate)
</ins><span class="cx"> {
</span><ins>+ if (!forceUpdate && this.controlsAreHidden())
+ return;
+
</ins><span class="cx"> this.updateTimelineMetricsIfNeeded();
</span><span class="cx"> this.drawTimelineBackground();
</span><span class="cx"> },
</span><span class="lines">@@ -1350,35 +1358,27 @@
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- updateForShowingControls: function()
</del><ins>+ showControls: function()
</ins><span class="cx"> {
</span><ins>+ this.updateShouldListenForPlaybackTargetAvailabilityEvent();
+ if (this.showInlinePlaybackPlaceholderOnly())
+ return;
+
</ins><span class="cx"> this.updateLayoutForDisplayedWidth();
</span><span class="cx"> this.setNeedsTimelineMetricsUpdate();
</span><del>- this.updateTime();
- this.updateProgress();
</del><ins>+ this.updateTime(true);
+ this.updateProgress(true);
</ins><span class="cx"> this.drawVolumeBackground();
</span><span class="cx"> this.drawTimelineBackground();
</span><span class="cx"> this.controls.panel.classList.add(this.ClassNames.show);
</span><span class="cx"> this.controls.panel.classList.remove(this.ClassNames.hidden);
</span><ins>+
</ins><span class="cx"> if (this.controls.panelBackground) {
</span><span class="cx"> this.controls.panelBackground.classList.add(this.ClassNames.show);
</span><span class="cx"> this.controls.panelBackground.classList.remove(this.ClassNames.hidden);
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><del>- showControls: function()
- {
- this.updateShouldListenForPlaybackTargetAvailabilityEvent();
- if (this.showInlinePlaybackPlaceholderOnly())
- return;
-
- this.updateForShowingControls();
- if (this.shouldHaveControls()) {
- this.base.appendChild(this.controls.inlinePlaybackPlaceholder);
- this.base.appendChild(this.controls.panel);
- }
- },
-
</del><span class="cx"> hideControls: function()
</span><span class="cx"> {
</span><span class="cx"> if (this.controlsAlwaysVisible())
</span><span class="lines">@@ -1454,8 +1454,7 @@
</span><span class="cx">
</span><span class="cx"> controlsAreHidden: function()
</span><span class="cx"> {
</span><del>- // Controls are only ever actually hidden when they are removed from the tree
- return !this.controls.panel.parentElement;
</del><ins>+ return !this.controlsAlwaysVisible() && !this.controls.panel.classList.contains(this.ClassNames.show);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> removeControls: function()
</span><span class="lines">@@ -1472,8 +1471,11 @@
</span><span class="cx"> this.setNeedsTimelineMetricsUpdate();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- updateTime: function()
</del><ins>+ updateTime: function(forceUpdate)
</ins><span class="cx"> {
</span><ins>+ if (!forceUpdate && this.controlsAreHidden())
+ return;
+
</ins><span class="cx"> var currentTime = this.video.currentTime;
</span><span class="cx"> var timeRemaining = currentTime - this.video.duration;
</span><span class="cx"> this.controls.currentTime.innerText = this.formatTime(currentTime);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (184608 => 184609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-05-20 01:19:41 UTC (rev 184608)
+++ trunk/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-05-20 01:48:33 UTC (rev 184609)
</span><span class="lines">@@ -202,12 +202,6 @@
</span><span class="cx"> // Explicitly do nothing to override base-class behavior.
</span><span class="cx"> },
</span><span class="cx">
</span><del>- controlsAreHidden: function()
- {
- // Controls are only ever actually hidden when they are removed from the tree
- return !this.controls.panelContainer.parentElement;
- },
-
</del><span class="cx"> addControls: function() {
</span><span class="cx"> this.base.appendChild(this.controls.inlinePlaybackPlaceholder);
</span><span class="cx"> this.base.appendChild(this.controls.panelContainer);
</span><span class="lines">@@ -386,15 +380,6 @@
</span><span class="cx"> this.updateShouldListenForPlaybackTargetAvailabilityEvent();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- handlePanelTransitionEnd: function(event)
- {
- var opacity = window.getComputedStyle(this.controls.panel).opacity;
- if (!parseInt(opacity) && !this.controlsAlwaysVisible()) {
- this.base.removeChild(this.controls.inlinePlaybackPlaceholder);
- this.base.removeChild(this.controls.panelContainer);
- }
- },
-
</del><span class="cx"> presentationMode: function() {
</span><span class="cx"> if ('webkitPresentationMode' in this.video)
</span><span class="cx"> return this.video.webkitPresentationMode;
</span><span class="lines">@@ -550,19 +535,6 @@
</span><span class="cx"> this.showControls();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- showControls: function()
- {
- this.updateShouldListenForPlaybackTargetAvailabilityEvent();
- if (this.showInlinePlaybackPlaceholderOnly())
- return;
-
- this.updateForShowingControls();
- if (this.shouldHaveControls()) {
- this.base.appendChild(this.controls.inlinePlaybackPlaceholder);
- this.base.appendChild(this.controls.panelContainer);
- }
- },
-
</del><span class="cx"> setShouldListenForPlaybackTargetAvailabilityEvent: function(shouldListen)
</span><span class="cx"> {
</span><span class="cx"> if (shouldListen && (this.shouldHaveStartPlaybackButton() || this.video.error))
</span></span></pre>
</div>
</div>
</body>
</html>