<!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>[178782] branches/safari-600.1.4.15-branch/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/178782">178782</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-01-20 17:03:30 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/174756">r174756</a>. rdar://problem/19420050</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs">branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsiOSjs">branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178781 => 178782)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 01:02:22 UTC (rev 178781)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 01:03:30 UTC (rev 178782)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-01-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r174756.
+
+ 2014-10-15 Dean Jackson <dino@apple.com>
+
+ [Media] Reduce style updates (painting) in controls
+ https://bugs.webkit.org/show_bug.cgi?id=137763
+ <rdar://problem/17833045>
+
+ Reviewed by Simon Fraser.
+
+ Media controls were causing a lot of repaints they were
+ constantly updating the style of the widgets, the value
+ of the forms, or the text in the display.
+
+ This is necessary when the controls are visible, but not
+ necessary when they are hidden. Return immediately in that case.
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.createControls): Initialise the slider to a zero value.
+ (Controller.prototype.handleDurationChange): Force an update even though we might be hidden.
+ (Controller.prototype.updateProgress): Don't update if we're hidden.
+ (Controller.prototype.updateTime): Ditto.
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.updateProgress): Ditto.
+
+2015-01-20 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r174741.
</span><span class="cx">
</span><span class="cx"> 2014-10-13 Chris Fleizach <cfleizach@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (178781 => 178782)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-01-21 01:02:22 UTC (rev 178781)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-01-21 01:03:30 UTC (rev 178782)
</span><span class="lines">@@ -332,6 +332,7 @@
</span><span class="cx"> timeline.setAttribute('pseudo', '-webkit-media-controls-timeline');
</span><span class="cx"> timeline.setAttribute('aria-label', this.UIString('Duration'));
</span><span class="cx"> timeline.type = 'range';
</span><ins>+ timeline.value = 0;
</ins><span class="cx"> this.listenFor(timeline, 'input', this.handleTimelineChange);
</span><span class="cx"> this.listenFor(timeline, 'mouseover', this.handleTimelineMouseOver);
</span><span class="cx"> this.listenFor(timeline, 'mouseout', this.handleTimelineMouseOut);
</span><span class="lines">@@ -566,8 +567,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">@@ -932,8 +933,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">
</span><span class="cx"> var background = 'url(\'data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1" preserveAspectRatio="none"><linearGradient id="gradient" x2="0" y2="100%" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="rgb(2, 2, 2)"/><stop offset="1" stop-color="rgb(23, 23, 23)"/></linearGradient><g style="fill:url(#gradient)">'
</span><span class="lines">@@ -1026,8 +1030,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="branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (178781 => 178782)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-01-21 01:02:22 UTC (rev 178781)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-01-21 01:03:30 UTC (rev 178782)
</span><span class="lines">@@ -241,9 +241,12 @@
</span><span class="cx"> return 'rgba(0, 0, 0, 0.5)';
</span><span class="cx"> },
</span><span class="cx">
</span><del>- updateProgress: function() {
- Controller.prototype.updateProgress.call(this);
</del><ins>+ updateProgress: function(forceUpdate) {
+ Controller.prototype.updateProgress.call(this, forceUpdate);
</ins><span class="cx">
</span><ins>+ if (!forceUpdate && this.controlsAreHidden())
+ return;
+
</ins><span class="cx"> var width = this.timelineWidth;
</span><span class="cx"> var height = this.timelineHeight;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>