<!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>[180450] 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/180450">180450</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-02-20 13:25:24 -0800 (Fri, 20 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/19450275> Media player updates.
Merge <a href="http://trac.webkit.org/projects/webkit/changeset/179808">r179808</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/180013">r180013</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/180024">r180024</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/180231">r180231</a>, <a href="http://trac.webkit.org/projects/webkit/changeset/180347">r180347</a>.</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="#branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsiOScss">branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css</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 (180449 => 180450)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-20 21:09:06 UTC (rev 180449)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-20 21:25:24 UTC (rev 180450)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2015-02-20 Dean Jackson <dino@apple.com>
+
+ <rdar://problem/19450275> Media player updates.
+
+ Merge r179808, r180013, r180024, r180231, r180347.
+
</ins><span class="cx"> 2015-02-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r180364.
</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 (180449 => 180450)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-02-20 21:09:06 UTC (rev 180449)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2015-02-20 21:25:24 UTC (rev 180450)
</span><span class="lines">@@ -956,7 +956,10 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> this.updateTimelineMetricsIfNeeded();
</span><ins>+ this.drawTimelineBackground();
+ },
</ins><span class="cx">
</span><ins>+ drawTimelineBackground: function() {
</ins><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="cx">
</span><span class="cx"> var duration = this.video.duration;
</span><span class="lines">@@ -1010,13 +1013,17 @@
</span><span class="cx"> this.controls.playButton.classList.remove(this.ClassNames.paused);
</span><span class="cx"> this.controls.playButton.setAttribute('aria-label', this.UIString('Pause'));
</span><span class="cx">
</span><del>- this.hideControls();
</del><span class="cx"> this.resetHideControlsTimer();
</span><span class="cx"> }
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> showControls: function()
</span><span class="cx"> {
</span><ins>+ this.setNeedsTimelineMetricsUpdate();
+
+ this.updateTime();
+ this.updateProgress(true);
+
</ins><span class="cx"> this.controls.panel.classList.add(this.ClassNames.show);
</span><span class="cx"> this.controls.panel.classList.remove(this.ClassNames.hidden);
</span><span class="cx">
</span><span class="lines">@@ -1030,7 +1037,7 @@
</span><span class="cx">
</span><span class="cx"> controlsAreHidden: function()
</span><span class="cx"> {
</span><del>- return !this.isAudio() && !this.controls.panel.classList.contains(this.ClassNames.show) || this.controls.panel.classList.contains(this.ClassNames.hidden);
</del><ins>+ return !this.isAudio() && this.controls.panel.classList.contains(this.ClassNames.hidden);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> removeControls: function()
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreModulesmediacontrolsmediaControlsiOScss"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css (180449 => 180450)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-02-20 21:09:06 UTC (rev 180449)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-02-20 21:25:24 UTC (rev 180450)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2012, 2013, 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2013, 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -22,6 +22,11 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+/* You'll see a lot of !important rules in this file. This is because
+ the inheritance and specificity of Shadow DOM trees is slightly
+ tricky. The page might have accidentally set a style and we have
+ to make sure it is reset. */
+
</ins><span class="cx"> audio {
</span><span class="cx"> min-width: 260px;
</span><span class="cx"> height: 39px;
</span><span class="lines">@@ -54,7 +59,6 @@
</span><span class="cx"> -webkit-flex-direction: column;
</span><span class="cx"> font-family: -apple-system-font;
</span><span class="cx"> overflow: hidden;
</span><del>- min-width: 260px;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-panel input[type="button"],
</span><span class="lines">@@ -66,9 +70,10 @@
</span><span class="cx"> -webkit-appearance: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-wireless-playback-status,
-audio::-webkit-media-controls-wireless-playback-status {
</del><ins>+video::-webkit-media-controls-inline-playback-placeholder,
+audio::-webkit-media-controls-inline-playback-placeholder {
</ins><span class="cx"> display: block;
</span><ins>+ z-index: 0;
</ins><span class="cx"> width: 100%;
</span><span class="cx"> height: 100%;
</span><span class="cx"> background-color: black;
</span><span class="lines">@@ -77,37 +82,11 @@
</span><span class="cx"> background-size: 100% 50%;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-wireless-playback-status.hidden,
-audio::-webkit-media-controls-wireless-playback-status.hidden {
</del><ins>+video::-webkit-media-controls-inline-playback-placeholder.hidden,
+audio::-webkit-media-controls-inline-playback-placeholder.hidden {
</ins><span class="cx"> display: none;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-audio::-webkit-media-controls-wireless-playback-picker-button,
-video::-webkit-media-controls-wireless-playback-picker-button {
- display: block;
- background-color: black;
- -webkit-mask-repeat: no-repeat;
- -webkit-mask-position: 0 1px;
-}
-
-audio::-webkit-media-controls-wireless-playback-picker-button {
- width: 44px;
- height: 39px;
- -webkit-mask-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 44 39"><g fill="none"><path stroke="white" stroke-width="1" d="M15.5,24.5 10.5,24.5 10.5,11.5 31.5,11.5 31.5,24.5 26.5,24.5 31.5,24.5 31.5,11.5 10.5,11.5 10.5,24.5 15.5,24.5 Z" /><path fill="white" d="M21,21 13.5,29 28.5,29" /></g></svg>');
-}
-
-video::-webkit-media-controls-wireless-playback-picker-button {
- width: 42px;
- height: 44px;
- -webkit-mask-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 42 44"><g fill="none"><path stroke="white" stroke-width="1" d="M15,27.5 10.5,27.5 10.5,14.5 30.5,14.5 30.5,27.5 26,27.5 30.5,27.5 30.5,14.5 10.5,14.5 10.5,27.5 15,27.5 Z" /><path fill="white" d="M20.5,23.5 13,31.5 28,31.5" /></g></svg>');
- opacity: 0.5;
-}
-
-video::-webkit-media-controls-wireless-playback-picker-button.active,
-audio::-webkit-media-controls-wireless-playback-picker-button.active {
- background-color: #1060FE;
-}
-
</del><span class="cx"> video::-webkit-media-text-track-container,
</span><span class="cx"> audio::-webkit-media-text-track-container {
</span><span class="cx"> position: relative;
</span><span class="lines">@@ -130,33 +109,32 @@
</span><span class="cx">
</span><span class="cx"> display: -webkit-flex;
</span><span class="cx"> -webkit-flex-direction: row;
</span><ins>+ -webkit-flex-wrap: nowrap;
+ -webkit-justify-content: flex-start;
</ins><span class="cx"> -webkit-align-items: center;
</span><del>- -webkit-user-select: none;
</del><span class="cx">
</span><span class="cx"> transition: opacity 0.25s linear;
</span><span class="cx"> -webkit-transform-origin: bottom left;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+video::-webkit-media-controls-panel .hidden,
+audio::-webkit-media-controls-panel .hidden {
+ display: none;
+}
+
</ins><span class="cx"> video::-webkit-media-controls-panel {
</span><ins>+ height: 50px;
+ width: 100%;
+ opacity: 0;
+ padding: 0;
</ins><span class="cx"> background-color: rgba(255, 255, 255, 0.6);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> audio::-webkit-media-controls-panel {
</span><del>- background-color: rgba(228, 228, 228, 1);
-}
-
-audio::-webkit-media-controls-panel {
</del><span class="cx"> height: 39px;
</span><del>- padding-right: 8px;
- padding-left: 7px;
-}
-
-video::-webkit-media-controls-panel {
- height: 44px;
</del><span class="cx"> width: 100%;
</span><del>- opacity: 0;
- padding-right: 24px;
- padding-left: 24px;
</del><ins>+ padding: 0;
+ background-color: rgba(228, 228, 228, 1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-panel.show,
</span><span class="lines">@@ -206,92 +184,171 @@
</span><span class="cx"> background-image: url('data:image/svg+xml,<svg viewBox="0 0 144 144" xmlns="http://www.w3.org/2000/svg"><circle cx="72" cy="72" r="70" fill="rgba(247, 247, 247, .82)"/><g fill="rgba(129, 129, 129, .9)"><rect x="14" y="70.4" transform="matrix(0.8493 0.5279 -0.5279 0.8493 48.8614 -27.1595)" width="116" height="3.2"/><polygon points="109,74 48,36 48,52.3 95.6,81.9 "/><polygon points="48,110 87.7,86.6 48,61.9 "/></g></svg>');
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* ================== ALL INLINE BUTTONS ====================== */
+
</ins><span class="cx"> video::-webkit-media-controls-play-button,
</span><span class="cx"> audio::-webkit-media-controls-play-button,
</span><span class="cx"> video::-webkit-media-controls-fullscreen-button,
</span><del>-audio::-webkit-media-controls-fullscreen-button {
</del><ins>+audio::-webkit-media-controls-fullscreen-button,
+audio::-webkit-media-controls-wireless-playback-picker-button,
+video::-webkit-media-controls-wireless-playback-picker-button {
</ins><span class="cx"> -webkit-appearance: none;
</span><span class="cx"> display: block;
</span><span class="cx"> padding: 0;
</span><span class="cx"> border: 0;
</span><span class="cx"> -webkit-user-select: none;
</span><span class="cx"> background-repeat: no-repeat;
</span><ins>+ background-position: 50% 50%;
+ mix-blend-mode: plus-darker;
+ opacity: 0.55;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+video::-webkit-media-controls-play-button:active,
+audio::-webkit-media-controls-play-button:active,
+video::-webkit-media-controls-fullscreen-button:active,
+audio::-webkit-media-controls-fullscreen-button:active,
+audio::-webkit-media-controls-wireless-playback-picker-button:active,
+video::-webkit-media-controls-wireless-playback-picker-button:active {
+ mix-blend-mode: normal;
+ opacity: 1;
+}
+
+/* ================== PLAY BUTTON ====================== */
+
+audio::-webkit-media-controls-play-button,
+video::-webkit-media-controls-play-button {
+ margin-left: 4px;
+ background-size: 18px 22px;
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAsCAYAAAANUxr1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6N0E5REFDQ0JBNUFDMTFFNDhCNDZEQ0MzRUNBRkEzRTciIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6N0E5REFDQ0FBNUFDMTFFNDhCNDZEQ0MzRUNBRkEzRTciIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjpp
bnN0YW5jZUlEPSJ4bXAuaWlkOjhBRjdGMDc4RTNBMjExRTI5MzQ4QzU0RDI5RUIzNDk5IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjhBRjdGMDc5RTNBMjExRTI5MzQ4QzU0RDI5RUIzNDk5Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+D59QlAAAAFVJREFUeNrs2bENgEAMA0AHsf/EIB5GcIGgOEvpIuf6TJIjXfZyv+qfe67ywJT7Vf+WnwUICAgICAgICAgICAgICAgICAgICAjoyzxvgvPlG1X/EmAASwgGTpkrSW0AAAAASUVORK5CYII=');
+ -webkit-order: 1;
+}
+
</ins><span class="cx"> audio::-webkit-media-controls-play-button {
</span><span class="cx"> width: 42px;
</span><span class="cx"> height: 39px;
</span><del>- background-size: 42px 39px;
- background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 42 39"><g fill="rgba(2, 2, 2, 1)"><rect x="13" y="9.5" width="6" height="20.5"/><rect x="24" y="9.5" width="6" height="20.5"/></g></svg>');
</del><span class="cx"> }
</span><span class="cx">
</span><del>-audio::-webkit-media-controls-play-button:active {
- background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 42 39"><g fill="white"><rect x="13" y="9.5" width="6" height="20.5"/><rect x="24" y="9.5" width="6" height="20.5"/></g></svg>');
</del><ins>+video::-webkit-media-controls-play-button {
+ width: 44px;
+ height: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-audio::-webkit-media-controls-play-button.paused {
- background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 42 39"><path fill="rgba(2, 2, 2, 1)" d="M11,9.5 32,20.5 11,31.5z"/></svg>');
</del><ins>+audio::-webkit-media-controls-play-button:active,
+video::-webkit-media-controls-play-button:active {
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAsCAYAAAANUxr1AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6N0E5REFDQ0ZBNUFDMTFFNDhCNDZEQ0MzRUNBRkEzRTciIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6N0E5REFDQ0VBNUFDMTFFNDhCNDZEQ0MzRUNBRkEzRTciIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjpp
bnN0YW5jZUlEPSJ4bXAuaWlkOjhBRjdGMDc4RTNBMjExRTI5MzQ4QzU0RDI5RUIzNDk5IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjhBRjdGMDc5RTNBMjExRTI5MzQ4QzU0RDI5RUIzNDk5Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+5aIXPQAAAFJJREFUeNrs2LENwCAQBMHHpv+KsR65hAuQHczG6H5iRnevyprh+5WO33W2aP+qnwUEBAQEBAQEBAQEBAQEBAQEBAQEBAT0Ze9P/nP4RrS/BRgAZAEHVf7/o+YAAAAASUVORK5CYII=');
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+audio::-webkit-media-controls-play-button.paused,
+video::-webkit-media-controls-play-button.paused {
+ background-size: 21px 22px;
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAsCAYAAAATmipGAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6ODIyMTJEMTRBNUFCMTFFNDhCNDZEQ0MzRUNBRkEzRTciIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ODIyMTJEMTNBNUFCMTFFNDhCNDZEQ0MzRUNBRkEzRTciIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjpp
bnN0YW5jZUlEPSJ4bXAuaWlkOjhBRjdGMDdDRTNBMjExRTI5MzQ4QzU0RDI5RUIzNDk5IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjNCQzEzNEY0RTNBMzExRTI5MzQ4QzU0RDI5RUIzNDk5Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+JBpORQAAAcRJREFUeNrU2T8ohHEcx/HH05NSShkMBoZb3OAmFhYyyCKTzWa7zWTyZ/CvKwxKMYhBKSWFW2RxCyklg4FicIWIXC5/z+dX3289dM6/5+75PL96lXSnt+s5vt/nbMuyOqDIIj82rMAutLHHZlwS0BKEULUFjUEIVXGoD0Ko8QarEGEPVa+wBGH2UHfwAoTYQ9UzzEI1e6h6hCmoZA9VDzAOFeyh6h5GoJw9VN3CAJSxh6pr6IVS9lB1AT1Qwh6qziEKxeyh6hS6wWEPVcfQJbNxzsHZ7xOSf8mH0PlVE0OonrAMPfvQ/nk9YgrVE5Gxcse9HjGG6jED+4asR83MoXrMJWA7xIF70CfrkMUYegD9cp1m9JtMoUcSuCx72ofDEHoCg7Aoa07W42foGQzBHLx892A/QpMwLPvW00+fVMjQSxiDaUj/9smFCL2BmCyAqb/+kHyG3sEETMrX/zr5CE3JqxeTV9OT42VoWq6/Ubjy+rf3ItS8c2dkRU6y3tIxgVWst3TMH+d55ptketuxhvW2oxkQzAcStX4PBbki16GOZbzKFrgJDWyDqjtwG5pYR34TaD4Qa2VenBzZodfcYz/jeRdgAMHrnv9Jf7YjAAAAAElFTkSuQmCC');
+}
+
+audio::-webkit-media-controls-play-button.paused:active,
+video::-webkit-media-controls-play-button.paused:active {
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACoAAAAsCAYAAAATmipGAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6N0E5REFDQzdBNUFDMTFFNDhCNDZEQ0MzRUNBRkEzRTciIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6N0E5REFDQzZBNUFDMTFFNDhCNDZEQ0MzRUNBRkEzRTciIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjpp
bnN0YW5jZUlEPSJ4bXAuaWlkOjhBRjdGMDdDRTNBMjExRTI5MzQ4QzU0RDI5RUIzNDk5IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjNCQzEzNEY0RTNBMzExRTI5MzQ4QzU0RDI5RUIzNDk5Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+Pkw0sAAAAglJREFUeNrMl0tERGEYhs8cR0TELFrMpkWrNq1q1Wq0qU1atWvXrlWt2nTVVbosImoRUUQkUqLSIjE1DDWLkYpatCgiYsg0p/fn/TjSfc7le3nMWZzhOb///7/vs13XbQMxYGnGtixrE5yCFktxbP7Wgx1wDJo0i0oawT445LNaUUmSq7sLGjSLSppBCmyBOs2iJjHQCjJgHdRqFfW+2w6yYAXUaBX1/qcD5MASqNYqKnFAJ7gE8yChVVRSBrrAFZgBVVpFJeWgG1yDcRDXKiqpAL3gBgyCSq2iEiM4QOFefoBKUUmcW8FsiR5uEZWiEnPIpnnoungIVYpKErzOLnm9OVpFJdUsGDkWEFurqKSGJTnLEm1rFZXUsunJsAmKaRWV1LGtTHnHI42ikgbPeJTULOrth21HsWAa9HMcsjSKnrP0mn3qentKLclRcAMUP2t+o47pAYbAGnj7rkuPKrdgFCyDwm/GibBzD8ZYPl//MveElQcwCRZA/j8DWtB5AlPsmF5KmSSDyjOYBXN8LilBiL5w9aa4mr7ET9E8998EePT76/0QNSd3kXPRfVD7qBTRAu/AEXAX9In8j6ipHqtgmFUllPxFtMg6PMC6HGp+I+qykzEt10VU9fYn0R2uYDrqzuUr0QOu4ImWHvCjqJlP+sCRtm5aRM8ouKd1LnE4Q297236NeRdgAAP83/qfKob+AAAAAElFTkSuQmCC');
+}
+
+/* ================== FULLSCREEN BUTTON ====================== */
+
</ins><span class="cx"> video::-webkit-media-controls-fullscreen-button {
</span><del>- width: 35px;
- height: 44px;
- background-size: 35px 44px;
- opacity: 0.9;
- background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 44"><g stroke="rgba(0, 0, 0, 0.4)" fill="none"><path d="M 10.5,20.5 v -5 h 5 M 10.5,15.5 l 5,5"/><path d="M 24.5,24.5 v 5 h -5 M 24.5,29.5 l -5,-5"/></g></svg>');
</del><ins>+ width: 44px;
+ height: 50px;
+ background-size: 15px 15px;
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo0MDY1NjBEMUE1QUYxMUU0OEI0NkRDQzNFQ0FGQTNFNyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo0MDY1NjBEMkE1QUYxMUU0OEI0NkRDQzNFQ0FGQTNFNyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjpp
bnN0YW5jZUlEPSJ4bXAuaWlkOjQwNjU2MENGQTVBRjExRTQ4QjQ2RENDM0VDQUZBM0U3IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjQwNjU2MEQwQTVBRjExRTQ4QjQ2RENDM0VDQUZBM0U3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+OuvolQAAAMpJREFUeNrs1UEOgkAMBdDWcAQXeARXXMq4cuEBjWfQjR6nFjMQREY6SX9hYZOfAJtHh9AyEQkZSkSYHGtDC9UYfmp2bXfjIOG7Zq+5MnMd0bWkbDW3dP3Q1NopodLD6SYM/4Aj8S84Cp+EI/AsjMYtbwbBrccyxI9h8AA/eB01dx966Vn9h9cP60Y7F201pyl0Kv3PveDiIeM5e014v/+dB/8sDoEtOAyew6HwLxwO5/AQOIO/4ZDtpBOtxS+apntWARBZ9ZJ4CTAAmUZswlMSWgoAAAAASUVORK5CYII=');
+ -webkit-order: 5;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-play-button {
- width: 41px;
- height: 44px;
- background-size: 41px 44px;
- opacity: 0.9;
- background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 41 44"><g fill="rgba(0, 0, 0, 0.4)"><rect x="11" y="11" width="6" height="22"/><rect x="23" y="11" width="6" height="22"/></g></svg>');
</del><ins>+video::-webkit-media-controls-fullscreen-button:active {
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo3NEE1MUQxNkE1QUYxMUU0OEI0NkRDQzNFQ0FGQTNFNyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo3NEE1MUQxN0E1QUYxMUU0OEI0NkRDQzNFQ0FGQTNFNyI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjpp
bnN0YW5jZUlEPSJ4bXAuaWlkOjc0QTUxRDE0QTVBRjExRTQ4QjQ2RENDM0VDQUZBM0U3IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjc0QTUxRDE1QTVBRjExRTQ4QjQ2RENDM0VDQUZBM0U3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+hm7UbgAAAMxJREFUeNrs1sEJwkAQBdBZsYQcYgmebMJzsBAPFmQpwRr0ok2kh/gjEcOSjbMwf5SQDx9CCDxC2JmEFhFdghhmJT9KDD/QTf92cWnwDd2iF7Skv3L7SYFe++s7Wnafn9UhLJ54DLvhY7ALnoLp+BRMxTUPUXDN5GrQ/eCcVxbHOOhHtRToAT17wzLLJbHAOTllbTWjgXDMPedWcPaQsRz8Wjw5n9k4BdbgNPgbToWncDqcwl3gMfwVr+3UrdQa3b1vrBm/6n+9JJ4CDAB4KPbj9o9c0wAAAABJRU5ErkJggg==');
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-play-button:active {
- background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 41 44"><g fill="white"><rect x="11" y="11" width="6" height="22"/><rect x="23" y="11" width="6" height="22"/></g></svg>');
</del><ins>+/* ================== AIRPLAY BUTTON ====================== */
+
+audio::-webkit-media-controls-wireless-playback-picker-button,
+video::-webkit-media-controls-wireless-playback-picker-button {
+ background-size: 21px 18px;
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAAkCAYAAAAQC8MVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDA2NTYwQzlBNUFGMTFFNDhCNDZEQ0MzRUNBRkEzRTciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDA2NTYwQ0FBNUFGMTFFNDhCNDZEQ0MzRUNBRkEzRTciPiA8eG1wTU06RGVyaXZlZEZyb20gc3RS
ZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3QTlEQUNEMEE1QUMxMUU0OEI0NkRDQzNFQ0FGQTNFNyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0MDY1NjBDOEE1QUYxMUU0OEI0NkRDQzNFQ0FGQTNFNyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PsGo4wwAAAE9SURBVHja7JYxbsIwFIZtIjFkyYTEwMhUiZmdA/QCOQE3YGPkBh2ZOiNxAAY2ZlaGDt06McCAhHj8T7WrCKXIcewoSO9J35DIfv5kJ7+slVKkXqT0S8oSkW6tpNYksiIrsiIrsiIrsiIrsiJbItuJ0DgDK9CLIU6/G0uqLqgu2JieO5AG6kt/X0AIWfNJfRYak3nWbZSdP4haFq2SReXg9o8sM22FLGoCLk9EmSt4DybryB5khSYjcHSce+Lxhbmp+QmrrO888BsMCov1zTuq0YPj7ct5vuex+OxK6elUWtdDNAFrT1ELZ3G3CdmPmqKWZVRZ1CyQqGUWRZajx0RQSFnO5jyoLGoMzoFFLZzRkyCyqCH4iSRq4ax+qyVrcvAQWdTC6/S8ZM11b9uQKLlcK6tc95qCMzwp87oLMABmUMEzVAChcAAAAABJRU5ErkJggg==');
+ -webkit-order: 3;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-play-button.paused {
- background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 41 44"><path fill="rgba(0, 0, 0, 0.4)" d="M10,11 31,22 10,33 Z"/></svg>');
</del><ins>+audio::-webkit-media-controls-wireless-playback-picker-button {
+ width: 44px;
+ height: 39px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-fullscreen-button:active {
- background-image: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 44"><g stroke="white" fill="none"><path d="M 10,20 v -5 h 5 M 10,15 l 5,5"/><path d="M 24,24 v 5 h -5 M 24,29 l -5,-5"/></g></svg>');
</del><ins>+video::-webkit-media-controls-wireless-playback-picker-button {
+ width: 44px;
+ height: 50px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+audio::-webkit-media-controls-wireless-playback-picker-button:active,
+video::-webkit-media-controls-wireless-playback-picker-button:active {
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAAkCAYAAAAQC8MVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTlDMDY1NzlBNUJFMTFFNDhCNDZEQ0MzRUNBRkEzRTciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTlDMDY1N0FBNUJFMTFFNDhCNDZEQ0MzRUNBRkEzRTciPiA8eG1wTU06RGVyaXZlZEZyb20gc3RS
ZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo1OUMwNjU3N0E1QkUxMUU0OEI0NkRDQzNFQ0FGQTNFNyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo1OUMwNjU3OEE1QkUxMUU0OEI0NkRDQzNFQ0FGQTNFNyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PtpJfI0AAAFESURBVHjaYvwPBAxDBDAxDCHAgsRmHMTu/D/kQnbUsaOOHXXsqGNHHTvq2FHHjjp21LFD1bH8QLwOiEUHu2PZoA4NBOLNQMw1WB0L6mnMA2InKN8ciGdRswdCTcfWAXE0mhiI30a9zg0CMFCAo4H433/cIJNC88GAGiHrBI1+fNE9GYj9qJkM/hOBL0FzOwzoQjMUGwF7mIF4GVQ9DIAy3wki7cVIBoTAYyCWQYoaCajYfwrMEAXi+8RqZiRzQAYUKvugOZ5UcBmIbYH4Iz1KA1CULifToaQkHao4lhqZBZQpZ9DasRVAnEmlUjMRah5J5Syx2A+I//ynLvgHLaOJcgOxIWsOTafMVG5LoFfRFCcDFVo0SrA0frQodSyombedFs09LM3KjYTsYSLg4zXQkKUHIBiDTATSkh2dOwN48wZAgAEAbPX73MzEV24AAAAASUVORK5CYII=');
+}
+
+/* ================== SPACER ====================== */
+
+video::-webkit-media-controls-spacer,
+audio::-webkit-media-controls-spacer {
+ -webkit-appearance: none !important;
+ -webkit-flex: 1 1 0; /* Should be the same as the timeline container. */
+ -webkit-order: 2;
+ height: 8px;
+ margin: 0;
+ background-color: transparent !important;
+}
+
+/* ================== TIMELINE ====================== */
+
</ins><span class="cx"> video::-webkit-media-controls-timeline,
</span><span class="cx"> audio::-webkit-media-controls-timeline {
</span><del>- -webkit-appearance: none;
</del><ins>+ -webkit-appearance: none !important;
</ins><span class="cx"> -webkit-flex: 1 1 0;
</span><del>- height: 3px;
</del><ins>+ height: 8px;
</ins><span class="cx"> margin: 0;
</span><del>-
- border-radius: 1.5px;
</del><ins>+ background-color: transparent !important;
+ background-size: 100% 100%;
+ border: none !important;
+ border-radius: 0 !important;
+ box-sizing: content-box !important;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-timeline {
- opacity: 0.75;
</del><ins>+audio::-webkit-media-controls-timeline::-webkit-slider-runnable-track,
+video::-webkit-media-controls-timeline::-webkit-slider-runnable-track {
+ -webkit-appearance: none !important;
+ background: none !important;
+ border: none !important;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-timeline::-webkit-slider-thumb,
</span><span class="cx"> audio::-webkit-media-controls-timeline::-webkit-slider-thumb {
</span><del>- -webkit-appearance: none;
- width: 16px;
- height: 16px;
- border: 0;
- border-radius: 8px;
- background-image: url('data:image/svg+xml,<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><circle r="7.75" cy="8" cx="8" fill="white" stroke="rgba(0, 0, 0, .25)" stroke-width=".5"/></svg>');
</del><ins>+ -webkit-appearance: none !important;
+ width: 15px;
+ height: 50px;
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAiCAYAAABIiGl0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAxNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iUGl4ZWxtYXRvciAyLjIiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTkwQ0UwODdBQTcxMTFFNEE5QTZGQTVGMjFBNkUxN0UiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTkwQ0UwODhBQTcxMTFFNEE5QTZGQTVGMjFBNkUxN0UiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlp
ZDo1OTBDRTA4NUFBNzExMUU0QTlBNkZBNUYyMUE2RTE3RSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo1OTBDRTA4NkFBNzExMUU0QTlBNkZBNUYyMUE2RTE3RSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pofoz4wAAAJGSURBVHjaxJfNTsJAEMfbLmoNaKIhIE18A+LReOXmi/gQnnwSLz6Fnjh4Id4kHElI5EDwpIkgImWdf/Nfs5ISCrR1kkmg7c5vZz/mw3WSy66oL7ojqqiQkPotOhGdaq1XGnMTvC+KlprN5kW9Xr8sFotnhUKhCsUHs9lsCB2NRu1Op3PfaDRa8vhDdCSqnQ0E3lX7/f6NGH7RCQXfYgzG0sZacthut6/G4/Gj3lAwFjZgKyn0qNfrXYdh+Ka3FNiALdhc6Sk+1CkL4Us997E0aXga5zmX3Y87vdVt9jTJnvPA/blJJZxEnbHwtJds8Mk6V2ZTAQMsAD1EJAQHpdSpk7GAARaYAPuISE5OQpYfeYwwmBeYrMhjZeJuHkKWAtj7B7DnJchQaQsylgvwHGktL6qwXsH0TE7NETw091gjiecFFtYzmNFSo3LICyysBzBxsI5xoWUJWllHL8lSfTnViFyTyGO4PhgMbrP2lgxNpnPAdBXkkBYDsg48lqbRDLrd7t18Pn9P21PYhG3zl8yoXsY+1zCjDEufgIxjMqPCHMm5wpdBBsVeQK2QpUzZs8dKsGY+SrG8DSxvj8j6DdOKHUPZhkO3KOiDBWiZDGW3MC4f7FPVYvKQyuE8YQvzFJMUcJg+qfit3YVKc4clqB8H3zAThWzmJmzstGN1fI511LVJXYzl7hZQ00F+2dA4sH3P7Am4a0zAeDklEODZYueoVgz+DS4rWk5tTdj2cmqt4tr9sccJFqyG3N4CGxrSu
3AZ0MiPAAMAZrLkuVVmRJsAAAAASUVORK5CYII=');
+ background-repeat: no-repeat;
+ background-size: 15px 17px;
+ background-position: 0px 17px;
</ins><span class="cx"> background-color: transparent !important;
</span><del>- box-shadow: 0 3px 1px -1px rgba(0, 0, 0, .15);
</del><ins>+ border: none !important;
</ins><span class="cx">
</span><del>- /* rotateZ() forces the layer into compositing mode. Slider
</del><ins>+ /* rotateZ() forces the layer into compositing mode. Slider
</ins><span class="cx"> thumbs are small, so forcing a compositing layer is inexpensive,
</span><span class="cx"> and it keeps the slider from having to repaint while sliding. */
</span><span class="cx"> -webkit-transform: rotateZ(0deg);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+video::-webkit-media-controls-timeline::-webkit-slider-thumb:active,
+audio::-webkit-media-controls-timeline::-webkit-slider-thumb:active {
+ background-color: transparent !important;
+}
+
+audio::-webkit-media-controls-timeline::-webkit-slider-thumb {
+ height: 39px;
+ background-position: 0px 12px;
+}
+
</ins><span class="cx"> video::-webkit-media-controls-current-time-display,
</span><span class="cx"> video::-webkit-media-controls-time-remaining-display,
</span><span class="cx"> audio::-webkit-media-controls-current-time-display,
</span><span class="lines">@@ -299,61 +356,79 @@
</span><span class="cx"> -webkit-user-select: none;
</span><span class="cx"> -webkit-flex: 0 0 0;
</span><span class="cx"> display: -webkit-flex;
</span><del>- -webkit-justify-content: center;
</del><span class="cx"> -webkit-align-items: center;
</span><del>- cursor: default;
</del><span class="cx"> overflow-y: hidden;
</span><span class="cx"> overflow-x: hidden;
</span><del>- min-width: 44px;
</del><span class="cx"> letter-spacing: normal;
</span><span class="cx"> word-spacing: normal;
</span><span class="cx"> line-height: normal;
</span><span class="cx"> text-transform: none;
</span><span class="cx"> text-indent: 0px;
</span><span class="cx"> text-decoration: none;
</span><del>-}
-
-video::-webkit-media-controls-current-time-display,
-video::-webkit-media-controls-time-remaining-display {
</del><ins>+ color: black;
+ mix-blend-mode: plus-darker;
+ opacity: 0.55;
+ height: 50px;
</ins><span class="cx"> font-size: 13px;
</span><del>- color: rgba(0, 0, 0, .5);
</del><span class="cx"> }
</span><span class="cx">
</span><ins>+audio::-webkit-media-controls-current-time-display,
</ins><span class="cx"> video::-webkit-media-controls-current-time-display {
</span><del>- padding-left: 6px;
</del><ins>+ min-width: 32px;
+ -webkit-justify-content: left;
+ padding-right: 6px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+audio::-webkit-media-controls-time-remaining-display,
</ins><span class="cx"> video::-webkit-media-controls-time-remaining-display {
</span><del>- padding-right: 13px;
</del><ins>+ min-width: 38px;
+ -webkit-justify-content: right;
+ padding-left: 6px;
+ margin-right: 6px;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-audio::-webkit-media-controls-current-time-display,
-audio::-webkit-media-controls-time-remaining-display {
- font-size: 12px;
- color: rgba(5, 5, 5, 1);
-}
-
-video::-webkit-media-controls-timeline-container .hour-long-time,
-audio::-webkit-media-controls-timeline-container .hour-long-time {
- min-width: 67px;
-}
-
</del><span class="cx"> video::-webkit-media-controls-timeline-container,
</span><span class="cx"> audio::-webkit-media-controls-timeline-container {
</span><span class="cx"> display: -webkit-flex;
</span><span class="cx"> -webkit-flex-direction: row;
</span><span class="cx"> -webkit-align-items: center;
</span><span class="cx"> -webkit-user-select: none;
</span><del>- -webkit-flex: 1 1 0;
</del><ins>+ -webkit-flex: 1 1 0; /* Any changes here should also be made on the spacer. */
</ins><span class="cx"> position: relative;
</span><span class="cx"> padding: 0;
</span><ins>+ -webkit-order: 2;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-video::-webkit-media-controls-panel .hidden,
-audio::-webkit-media-controls-panel .hidden {
- display: none;
</del><ins>+audio::-webkit-media-controls-timeline-container {
+ padding-right: 10px;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+video::-webkit-media-controls-timeline-container .hour-long-time,
+audio::-webkit-media-controls-timeline-container .hour-long-time {
+ min-width: 67px;
+}
+
+/* ================== STATUS DISPLAY ====================== */
+
+video::-webkit-media-controls-status-display,
+audio::-webkit-media-controls-status-display {
+
+ overflow: hidden;
+ font-family: -apple-system-font;
+ letter-spacing: normal;
+ word-spacing: normal;
+ line-height: normal;
+ text-transform: none;
+ text-indent: 0px;
+ text-decoration: none;
+ color: black;
+ mix-blend-mode: plus-darker;
+ opacity: 0.55;
+ -webkit-order: 2;
+}
+
+/* ================== CAPTIONS ====================== */
+
</ins><span class="cx"> video::-webkit-media-text-track-container {
</span><span class="cx"> position: relative;
</span><span class="cx"> width: 100%;
</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 (180449 => 180450)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-02-20 21:09:06 UTC (rev 180449)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-02-20 21:25:24 UTC (rev 180450)
</span><span class="lines">@@ -5,24 +5,38 @@
</span><span class="cx">
</span><span class="cx"> function ControllerIOS(root, video, host)
</span><span class="cx"> {
</span><ins>+ this.doingSetup = true;
</ins><span class="cx"> this.hasWirelessPlaybackTargets = false;
</span><span class="cx"> this._pageScaleFactor = 1;
</span><span class="cx"> this.isListeningForPlaybackTargetAvailabilityEvent = false;
</span><ins>+
+ this.timelineContextName = "_webkit-media-controls-timeline-" + ControllerIOS.gLastTimelineId++;
+
</ins><span class="cx"> Controller.call(this, root, video, host);
</span><span class="cx">
</span><span class="cx"> this.updateWirelessTargetAvailable();
</span><span class="cx"> this.updateWirelessPlaybackStatus();
</span><span class="cx"> this.setNeedsTimelineMetricsUpdate();
</span><span class="cx">
</span><ins>+ this._timelineIsHidden = false;
+ this._currentDisplayWidth = 0;
+ this.scheduleUpdateLayoutForDisplayedWidth();
+
</ins><span class="cx"> host.controlsDependOnPageScaleFactor = true;
</span><ins>+ this.doingSetup = false;
</ins><span class="cx"> };
</span><span class="cx">
</span><ins>+/* Constants */
+ControllerIOS.MinimumTimelineWidth = 220;
+ControllerIOS.ButtonWidth = 48;
+
</ins><span class="cx"> /* Enums */
</span><span class="cx"> ControllerIOS.StartPlaybackControls = 2;
</span><span class="cx">
</span><span class="cx"> /* Globals */
</span><span class="cx"> ControllerIOS.gWirelessImage = 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 200 245"><g fill="#1060FE"><path d="M193.6,6.3v121.6H6.4V6.3H193.6 M199.1,0.7H0.9v132.7h198.2V0.7L199.1,0.7z"/><path d="M43.5,139.3c15.8,8,35.3,12.7,56.5,12.7s40.7-4.7,56.5-12.7H43.5z"/></g><g text-anchor="middle" font-family="Helvetica Neue"><text x="100" y="204" fill="white" font-size="24">##DEVICE_TYPE##</text><text x="100" y="234" fill="#5C5C5C" font-size="21">##DEVICE_NAME##</text></g></svg>';
</span><span class="cx"> ControllerIOS.gSimulateWirelessPlaybackTarget = false; // Used for testing when there are no wireless targets.
</span><ins>+ControllerIOS.gLastTimelineId = 0;
</ins><span class="cx">
</span><span class="cx"> ControllerIOS.prototype = {
</span><span class="cx"> addVideoListeners: function() {
</span><span class="lines">@@ -63,9 +77,15 @@
</span><span class="cx"> shouldHaveStartPlaybackButton: function() {
</span><span class="cx"> var allowsInline = this.host.mediaPlaybackAllowsInline;
</span><span class="cx">
</span><ins>+ if (this.isPlaying || this.hasPlayed)
+ return false;
+
</ins><span class="cx"> if (this.isAudio() && allowsInline)
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (this.doingSetup)
+ return true;
+
</ins><span class="cx"> if (this.isFullScreen())
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -78,9 +98,6 @@
</span><span class="cx"> if (this.video.currentSrc && this.video.error)
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- if (!this.host.userGestureRequired && allowsInline)
- return false;
-
</del><span class="cx"> return true;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -125,10 +142,10 @@
</span><span class="cx">
</span><span class="cx"> this.controls.wirelessPlaybackStatus.classList.remove(this.ClassNames.hidden);
</span><span class="cx"> this.controls.wirelessTargetPicker.classList.add(this.ClassNames.active);
</span><del>- } else {
</del><ins>+ } else {
</ins><span class="cx"> this.controls.wirelessPlaybackStatus.classList.add(this.ClassNames.hidden);
</span><span class="cx"> this.controls.wirelessTargetPicker.classList.remove(this.ClassNames.active);
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> updateWirelessTargetAvailable: function() {
</span><span class="lines">@@ -145,6 +162,13 @@
</span><span class="cx"> wirelessPlaybackStatus.setAttribute('pseudo', '-webkit-media-controls-wireless-playback-status');
</span><span class="cx"> wirelessPlaybackStatus.classList.add(this.ClassNames.hidden);
</span><span class="cx">
</span><ins>+ var panelCompositedParent = this.controls.panelCompositedParent = document.createElement('div');
+ panelCompositedParent.setAttribute('pseudo', '-webkit-media-controls-panel-composited-parent');
+
+ var spacer = this.controls.spacer = document.createElement('div');
+ spacer.setAttribute('pseudo', '-webkit-media-controls-spacer');
+ spacer.classList.add(this.ClassNames.hidden);
+
</ins><span class="cx"> var wirelessTargetPicker = this.controls.wirelessTargetPicker = document.createElement('button');
</span><span class="cx"> wirelessTargetPicker.setAttribute('pseudo', '-webkit-media-controls-wireless-playback-picker-button');
</span><span class="cx"> wirelessTargetPicker.setAttribute('aria-label', this.UIString('Choose Wireless Display'));
</span><span class="lines">@@ -169,6 +193,8 @@
</span><span class="cx"> this.listenFor(this.controls.fullscreenButton, 'touchend', this.handleFullscreenTouchEnd);
</span><span class="cx"> this.listenFor(this.controls.fullscreenButton, 'touchcancel', this.handleFullscreenTouchCancel);
</span><span class="cx"> this.stopListeningFor(this.controls.playButton, 'click', this.handlePlayButtonClicked);
</span><ins>+
+ this.controls.timeline.style.backgroundImage = '-webkit-canvas(' + this.timelineContextName + ')';
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> setControlsType: function(type) {
</span><span class="lines">@@ -206,6 +232,7 @@
</span><span class="cx">
</span><span class="cx"> this.controls.panel.appendChild(this.controls.playButton);
</span><span class="cx"> this.controls.panel.appendChild(this.controls.statusDisplay);
</span><ins>+ this.controls.panel.appendChild(this.controls.spacer);
</ins><span class="cx"> this.controls.panel.appendChild(this.controls.timelineBox);
</span><span class="cx"> this.controls.panel.appendChild(this.controls.wirelessTargetPicker);
</span><span class="cx"> if (!this.isLive) {
</span><span class="lines">@@ -213,12 +240,16 @@
</span><span class="cx"> this.controls.timelineBox.appendChild(this.controls.timeline);
</span><span class="cx"> this.controls.timelineBox.appendChild(this.controls.remainingTime);
</span><span class="cx"> }
</span><del>- if (!this.isAudio())
</del><ins>+ if (this.isAudio()) {
+ // Hide the scrubber on audio until the user starts playing.
+ this.controls.timelineBox.classList.add(this.ClassNames.hidden);
+ } else {
</ins><span class="cx"> this.controls.panel.appendChild(this.controls.fullscreenButton);
</span><ins>+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> configureFullScreenControls: function() {
</span><del>- // Do nothing
</del><ins>+ // Explicitly do nothing to override base-class behavior.
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> hideControls: function() {
</span><span class="lines">@@ -227,48 +258,91 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> showControls: function() {
</span><ins>+ this.updateLayoutForDisplayedWidth();
+ this.updateTime(true);
+ this.updateProgress(true);
</ins><span class="cx"> Controller.prototype.showControls.call(this);
</span><span class="cx"> this.updateShouldListenForPlaybackTargetAvailabilityEvent();
</span><span class="cx"> },
</span><span class="cx">
</span><ins>+ addControls: function() {
+ this.base.appendChild(this.controls.panelCompositedParent);
+ this.controls.panelCompositedParent.appendChild(this.controls.panel);
+ this.setNeedsTimelineMetricsUpdate();
+ },
+
</ins><span class="cx"> updateControls: function() {
</span><span class="cx"> if (this.shouldHaveStartPlaybackButton())
</span><span class="cx"> this.setControlsType(ControllerIOS.StartPlaybackControls);
</span><del>- else if (this.isFullScreen())
- this.setControlsType(Controller.FullScreenControls);
</del><span class="cx"> else
</span><span class="cx"> this.setControlsType(Controller.InlineControls);
</span><span class="cx">
</span><ins>+ this.updateLayoutForDisplayedWidth();
</ins><span class="cx"> this.setNeedsTimelineMetricsUpdate();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- updateTime: function() {
- Controller.prototype.updateTime.call(this);
</del><ins>+ updateTime: function(forceUpdate) {
+ Controller.prototype.updateTime.call(this, forceUpdate);
</ins><span class="cx"> this.updateProgress();
</span><span class="cx"> },
</span><span class="cx">
</span><del>- progressFillStyle: function() {
- return 'rgba(0, 0, 0, 0.5)';
</del><ins>+ addRoundedRect: function(ctx, x, y, width, height, radius) {
+ ctx.moveTo(x + radius, y);
+ ctx.arcTo(x + width, y, x + width, y + radius, radius);
+ ctx.lineTo(x + width, y + height - radius);
+ ctx.arcTo(x + width, y + height, x + width - radius, y + height, radius);
+ ctx.lineTo(x + radius, y + height);
+ ctx.arcTo(x, y + height, x, y + height - radius, radius);
+ ctx.lineTo(x, y + radius);
+ ctx.arcTo(x, y, x + radius, y, radius);
</ins><span class="cx"> },
</span><span class="cx">
</span><del>- updateProgress: function(forceUpdate) {
- Controller.prototype.updateProgress.call(this, forceUpdate);
</del><ins>+ drawTimelineBackground: function() {
+ var width = this.timelineWidth * window.devicePixelRatio;
+ var height = this.timelineHeight * window.devicePixelRatio;
</ins><span class="cx">
</span><del>- if (!forceUpdate && this.controlsAreHidden())
</del><ins>+ if (!width || !height)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- var width = this.timelineWidth;
- var height = this.timelineHeight;
</del><ins>+ var played = this.video.currentTime / this.video.duration;
+ var buffered = 0;
+ for (var i = 0, end = this.video.buffered.length; i < end; ++i)
+ buffered = Math.max(this.video.buffered.end(i), buffered);
</ins><span class="cx">
</span><del>- // Magic number, matching the value for ::-webkit-media-controls-timeline::-webkit-slider-thumb
- // in mediaControlsiOS.css. Since we cannot ask the thumb for its offsetWidth as it's in its own
- // shadow dom, just hard-code the value.
- var thumbWidth = 16;
- var endX = thumbWidth / 2 + (width - thumbWidth) * this.video.currentTime / this.video.duration;
</del><ins>+ buffered /= this.video.duration;
</ins><span class="cx">
</span><del>- var context = document.getCSSCanvasContext('2d', 'timeline-' + this.timelineID, width, height);
- context.fillStyle = 'white';
- context.fillRect(0, 0, endX, height);
</del><ins>+ var ctx = document.getCSSCanvasContext('2d', this.timelineContextName, width, height);
+
+ ctx.clearRect(0, 0, width, height);
+
+ var midY = height / 2;
+
+ // 1. Draw the outline with a clip path that subtracts the
+ // middle of a lozenge. This produces a better result than
+ // stroking when we come to filling the parts below.
+ ctx.save();
+ ctx.beginPath();
+ this.addRoundedRect(ctx, 1, midY - 3, width - 2, 6, 3);
+ this.addRoundedRect(ctx, 2, midY - 2, width - 4, 4, 2);
+ ctx.closePath();
+ ctx.clip("evenodd");
+ ctx.fillStyle = "black";
+ ctx.fillRect(0, 0, width, height);
+ ctx.restore();
+
+ // 2. Draw the buffered part and played parts, using
+ // solid rectangles that are clipped to the outside of
+ // the lozenge.
+ ctx.save();
+ ctx.beginPath();
+ this.addRoundedRect(ctx, 1, midY - 3, width - 2, 6, 3);
+ ctx.closePath();
+ ctx.clip();
+ ctx.fillStyle = "black";
+ ctx.fillRect(0, 0, Math.round(width * buffered) + 2, height);
+ ctx.fillStyle = "white";
+ ctx.fillRect(0, 0, Math.round(width * played) + 2, height);
+ ctx.restore();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> formatTime: function(time) {
</span><span class="lines">@@ -283,7 +357,7 @@
</span><span class="cx"> if (intHours > 0)
</span><span class="cx"> return sign + intHours + ':' + String('00' + intMinutes).slice(-2) + ":" + String('00' + intSeconds).slice(-2);
</span><span class="cx">
</span><del>- return sign + String('00' + intMinutes).slice(intMinutes >= 10 ? -2 : -1) + ":" + String('00' + intSeconds).slice(-2);
</del><ins>+ return sign + String('00' + intMinutes).slice(-2) + ":" + String('00' + intSeconds).slice(-2);
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleTimelineChange: function(event) {
</span><span class="lines">@@ -324,6 +398,10 @@
</span><span class="cx"> if (!this.video.controls || this.isAudio() || this.isFullScreen() || this.gestureStartTime === undefined || this.controlsType == ControllerIOS.StartPlaybackControls)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ var scaleDetectionThreshold = 0.2;
+ if (event.scale > 1 + scaleDetectionThreshold || event.scale < 1 - scaleDetectionThreshold)
+ delete this.lastDoubleTouchTime;
+
</ins><span class="cx"> if (this.mostRecentNumberOfTargettedTouches == 2 && event.scale >= 1.0)
</span><span class="cx"> event.preventDefault();
</span><span class="cx">
</span><span class="lines">@@ -334,7 +412,9 @@
</span><span class="cx">
</span><span class="cx"> var velocity = Math.abs(event.scale - 1) / duration;
</span><span class="cx">
</span><del>- if (event.scale < 1.25 || velocity < 2)
</del><ins>+ var pinchOutVelocityThreshold = 2;
+ var pinchOutGestureScaleThreshold = 1.25;
+ if (velocity < pinchOutVelocityThreshold || event.scale < pinchOutGestureScaleThreshold)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> delete this.gestureStartTime;
</span><span class="lines">@@ -406,11 +486,11 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleStartPlaybackButtonTouchStart: function(event) {
</span><del>- this.controls.fullscreenButton.classList.add('active');
</del><ins>+ this.controls.startPlaybackButton.classList.add('active');
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleStartPlaybackButtonTouchEnd: function(event) {
</span><del>- this.controls.fullscreenButton.classList.remove('active');
</del><ins>+ this.controls.startPlaybackButton.classList.remove('active');
</ins><span class="cx"> if (this.video.error)
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -421,7 +501,7 @@
</span><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> handleStartPlaybackButtonTouchCancel: function(event) {
</span><del>- this.controls.fullscreenButton.classList.remove('active');
</del><ins>+ this.controls.startPlaybackButton.classList.remove('active');
</ins><span class="cx"> return true;
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -484,8 +564,19 @@
</span><span class="cx">
</span><span class="cx"> setPlaying: function(isPlaying)
</span><span class="cx"> {
</span><ins>+ Controller.prototype.setPlaying.call(this, isPlaying);
+
</ins><span class="cx"> this.updateControls();
</span><del>- Controller.prototype.setPlaying.call(this, isPlaying);
</del><ins>+
+ if (isPlaying && this.isAudio() && !this._timelineIsHidden) {
+ this.controls.timelineBox.classList.remove(this.ClassNames.hidden);
+ this.controls.spacer.classList.add(this.ClassNames.hidden);
+ }
+
+ if (isPlaying)
+ this.hasPlayed = true;
+ else
+ this.showControls();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> setShouldListenForPlaybackTargetAvailabilityEvent: function(shouldListen)
</span><span class="lines">@@ -503,11 +594,13 @@
</span><span class="cx"> this.stopListeningFor(this.video, 'webkitplaybacktargetavailabilitychanged', this.handleWirelessTargetAvailableChange);
</span><span class="cx"> },
</span><span class="cx">
</span><del>- get pageScaleFactor() {
</del><ins>+ get pageScaleFactor()
+ {
</ins><span class="cx"> return this._pageScaleFactor;
</span><span class="cx"> },
</span><span class="cx">
</span><del>- set pageScaleFactor(newScaleFactor) {
</del><ins>+ set pageScaleFactor(newScaleFactor)
+ {
</ins><span class="cx"> if (this._pageScaleFactor === newScaleFactor)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -526,9 +619,66 @@
</span><span class="cx"> this.controls.panel.style.webkitTransform = scaleTransform;
</span><span class="cx"> this.setNeedsTimelineMetricsUpdate();
</span><span class="cx"> this.updateProgress();
</span><ins>+ this.scheduleUpdateLayoutForDisplayedWidth();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- }
</del><ins>+ },
+
+ scheduleUpdateLayoutForDisplayedWidth: function ()
+ {
+ setTimeout(function () {
+ this.updateLayoutForDisplayedWidth();
+ }.bind(this), 0);
+ },
+
+ updateLayoutForDisplayedWidth: function()
+ {
+ if (!this.controls || !this.controls.panel)
+ return;
+
+ var visibleWidth = this.controls.panel.getBoundingClientRect().width * this._pageScaleFactor;
+ if (visibleWidth <= 0 || visibleWidth == this._currentDisplayWidth)
+ return;
+
+ this._currentDisplayWidth = visibleWidth;
+
+ // We need to work out how many right-hand side buttons are available.
+ this.updateWirelessTargetAvailable();
+ this.updateFullscreenButton();
+
+ var visibleButtonWidth = ControllerIOS.ButtonWidth; // We always try to show the fullscreen button.
+
+ if (!this.controls.wirelessTargetPicker.classList.contains(this.ClassNames.hidden))
+ visibleButtonWidth += ControllerIOS.ButtonWidth;
+
+ // Check if there is enough room for the scrubber.
+ if ((visibleWidth - visibleButtonWidth) < ControllerIOS.MinimumTimelineWidth) {
+ this.controls.timelineBox.classList.add(this.ClassNames.hidden);
+ this.controls.spacer.classList.remove(this.ClassNames.hidden);
+ this._timelineIsHidden = true;
+ } else {
+ if (!this.isAudio() || this.hasPlayed) {
+ this.controls.timelineBox.classList.remove(this.ClassNames.hidden);
+ this.controls.spacer.classList.add(this.ClassNames.hidden);
+ this._timelineIsHidden = false;
+ } else
+ this.controls.spacer.classList.remove(this.ClassNames.hidden);
+ }
+
+ // Drop the airplay button if there isn't enough space.
+ if (visibleWidth < visibleButtonWidth) {
+ this.controls.wirelessTargetPicker.classList.add(this.ClassNames.hidden);
+ visibleButtonWidth -= ControllerIOS.ButtonWidth;
+ }
+
+ // And finally, drop the fullscreen button as a last resort.
+ if (visibleWidth < visibleButtonWidth) {
+ this.controls.fullscreenButton.classList.add(this.ClassNames.hidden);
+ visibleButtonWidth -= ControllerIOS.ButtonWidth;
+ } else
+ this.controls.fullscreenButton.classList.remove(this.ClassNames.hidden);
+ },
+
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Object.create(Controller.prototype).extend(ControllerIOS.prototype);
</span></span></pre>
</div>
</div>
</body>
</html>