<!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>[181103] 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/181103">181103</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-03-05 14:47:13 -0800 (Thu, 05 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/180906">r180906</a>. <rdar://problem/20058845></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="#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 (181102 => 181103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-03-05 22:28:41 UTC (rev 181102)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-03-05 22:47:13 UTC (rev 181103)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-03-05 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><ins>+ Merge r180906. <rdar://problem/20058845>
+
+ 2015-03-02 Dean Jackson <dino@apple.com>
+
+ [iOS Media] Airplay button should be blue when active
+ https://bugs.webkit.org/show_bug.cgi?id=142193
+
+ Reviewed by Brent Fulgham.
+
+ Add a blue form of the Airplay button that is used
+ when we are actively displaying on another screen.
+
+ * Modules/mediacontrols/mediaControlsiOS.css:
+ (video::-webkit-media-controls-wireless-playback-picker-button):
+ (video::-webkit-media-controls-wireless-playback-picker-button:active):
+ (video::-webkit-media-controls-wireless-playback-picker-button.playing):
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.updateWirelessPlaybackStatus):
+
+2015-03-05 Dean Jackson <dino@apple.com>
+
</ins><span class="cx"> Merge r181085. <rdar://problem/20058743>
</span><span class="cx">
</span><span class="cx"> 2015-03-04 Dean Jackson <dino@apple.com>
</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 (181102 => 181103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-03-05 22:28:41 UTC (rev 181102)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.css 2015-03-05 22:47:13 UTC (rev 181103)
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> audio::-webkit-media-controls-wireless-playback-picker-button,
</span><span class="cx"> video::-webkit-media-controls-wireless-playback-picker-button {
</span><span class="cx"> background-size: 21px 18px;
</span><del>- background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAAkCAYAAAAQC8MVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDA2NTYwQzlBNUFGMTFFNDhCNDZEQ0MzRUNBRkEzRTciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDA2NTYwQ0FBNUFGMTFFNDhCNDZEQ0MzRUNBRkEzRTciPiA8eG1wTU06RGVyaXZl
ZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3QTlEQUNEMEE1QUMxMUU0OEI0NkRDQzNFQ0FGQTNFNyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0MDY1NjBDOEE1QUYxMUU0OEI0NkRDQzNFQ0FGQTNFNyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PsGo4wwAAAE9SURBVHja7JYxbsIwFIZtIjFkyYTEwMhUiZmdA/QCOQE3YGPkBh2ZOiNxAAY2ZlaGDt06McCAhHj8T7WrCKXIcewoSO9J35DIfv5kJ7+slVKkXqT0S8oSkW6tpNYksiIrsiIrsiIrsiIrsiJbItuJ0DgDK9CLIU6/G0uqLqgu2JieO5AG6kt/X0AIWfNJfRYak3nWbZSdP4haFq2SReXg9o8sM22FLGoCLk9EmSt4DybryB5khSYjcHSce+Lxhbmp+QmrrO888BsMCov1zTuq0YPj7ct5vuex+OxK6elUWtdDNAFrT1ELZ3G3CdmPmqKWZVRZ1CyQqGUWRZajx0RQSFnO5jyoLGoMzoFFLZzRkyCyqCH4iSRq4ax+qyVrcvAQWdTC6/S8ZM11b9uQKLlcK6tc95qCMzwp87oLMABmUMEzVAChcAAAAABJRU5ErkJggg==');
</del><ins>+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAAkCAYAAAAQC8MVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAWZJREFUeNpiYWBg+M8wRAATwxACLDDG////GQerIxkZGf8PuZAddeyoY0cdO+rYUceOOnbUsaOOHXXskHQssO3JD8TrgFh0UDsW6EA2ILUOiAOBeDOQzzUoHQt0GKinMQ+InaBC5kA8Cyo+6EK2Doij0cRA/DZqhu5/SBfsPwO5GOqofzCzsOBMCs2HmUOZY6HR/hOPQ0H4DxD7Uc2xROJLQMyPZIguEH8gUu8XkHokvaDMd4JE+4lW+BiIZZAsk4CK/afADFDxdp9o/WRGCzmhgjV2SMFMZBRRzEBqObRoIgeAks46aJlM86JrMiizUFgCgTLlDNLLLdKiv4LMqMeFK0iynwSH+kGLIGo6FlQ2R1PVsdD0+ZXKDoVhUBntRJUMBswIKqBGCbQEoAVgg2Y4LYoyGLSZtx1aHtIS8APxRkLNSiYCzb01QKxCp7a1CqFmJROB5p4dnTsDoLyxHFqWYwCAAAMAXS6KZKmsGPwAAAAASUVORK5CYII=');
</ins><span class="cx"> -webkit-order: 3;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -284,9 +284,16 @@
</span><span class="cx">
</span><span class="cx"> audio::-webkit-media-controls-wireless-playback-picker-button:active,
</span><span class="cx"> video::-webkit-media-controls-wireless-playback-picker-button:active {
</span><del>- background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAAkCAYAAAAQC8MVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyhpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMDE0IDc5LjE1Njc5NywgMjAxNC8wOC8yMC0wOTo1MzowMiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTlDMDY1NzlBNUJFMTFFNDhCNDZEQ0MzRUNBRkEzRTciIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTlDMDY1N0FBNUJFMTFFNDhCNDZEQ0MzRUNBRkEzRTciPiA8eG1wTU06RGVyaXZl
ZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo1OUMwNjU3N0E1QkUxMUU0OEI0NkRDQzNFQ0FGQTNFNyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo1OUMwNjU3OEE1QkUxMUU0OEI0NkRDQzNFQ0FGQTNFNyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PtpJfI0AAAFESURBVHjaYvwPBAxDBDAxDCHAgsRmHMTu/D/kQnbUsaOOHXXsqGNHHTvq2FHHjjp21LFD1bH8QLwOiEUHu2PZoA4NBOLNQMw1WB0L6mnMA2InKN8ciGdRswdCTcfWAXE0mhiI30a9zg0CMFCAo4H433/cIJNC88GAGiHrBI1+fNE9GYj9qJkM/hOBL0FzOwzoQjMUGwF7mIF4GVQ9DIAy3wki7cVIBoTAYyCWQYoaCajYfwrMEAXi+8RqZiRzQAYUKvugOZ5UcBmIbYH4Iz1KA1CULifToaQkHao4lhqZBZQpZ9DasRVAnEmlUjMRah5J5Syx2A+I//ynLvgHLaOJcgOxIWsOTafMVG5LoFfRFCcDFVo0SrA0frQodSyombedFs09LM3KjYTsYSLg4zXQkKUHIBiDTATSkh2dOwN48wZAgAEAbPX73MzEV24AAAAASUVORK5CYII=');
</del><ins>+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAAkCAYAAAAQC8MVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAU1JREFUeNpi/A8EDEMEMDEMIcCCxGYcxO78P+RCdtSxo44ddeyoY0cdO+rYUceOOnbUsUPVsfxAvA6IRQe7Y9mgDg0E4s1AzDVYHQvqacwDYico3xyIZ1GzB0JNx9YBcTSaGIjfRr3ODQIwUICjgfjff9wgk0LzwYAaIesEjX580T0ZiP2omQz+E4EvQXM7DOhCMxQbAXuYgXgZVD0MgDLfCSLtJTnNPgFiLyD+COVLAPE2NMfjA9xQ9TJQ/jcg9gXiB6SMG5CTW0GhsgHJYmKBDNTBtlBPvwZiRVqWBqAoXQ4tmsgBxCYdqjiWGpkFlCln0NqxFUCcSaVSMxFqHk0cCwrNFipXz21YKhKKHWsOTafMVHYsehVNsWNVaNEowdL40aLUsaBm3nZaNPewNCs3ErKHiYCP10BDlh6AYAwyEUhLdnTuDODNGwABBgCho8gNeNsIzwAAAABJRU5ErkJggg==');
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+audio::-webkit-media-controls-wireless-playback-picker-button.playing,
+video::-webkit-media-controls-wireless-playback-picker-button.playing {
+ opacity: 1;
+ mix-blend-mode: normal;
+ background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACsAAAAkCAYAAAAQC8MVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAWRJREFUeNpikQ37/59hiAAmhiEEWJDYjAPhgEcrCauRC2f4P+RCdtSxo44ddeyoY0cdO+rYUceOOnbUsUPVsfxAvA6IRQe7Y9mgDg0E4s1AzDVYHQvqacwDYico3xyIZ1GzB0JNx9YBcTSaGIjfNtgcC3JUPQ65CiDOHCyOdYJGP77ongzEfhSnMxLHDS4DsS0Qf4TydYH4MLQEIAS+ArEl1AwGaObbB03bVA/ZJ0DsheRQCSDeRqRDQYAbql4Gyv8GxL5A/ICUcQNycisoVDYgWUwskIE6GBY7rx+tZFCkZZplBuLlpEQfGtCFlsVs9Mhg1MgsoEw5g9aOpVoxBASJUPNo4lhQaLZQuXpukwvHqEgodqw5NJ0yU9mx4Coa6GAnajlWhRaNEvTGD9DBWpQ6FtTM206L5h6WZuVGoINFyXUsyMdroCFLDwCOQaCDuUh1LKy5Z0fnzgA4bwAdjDVvAAQYAKnHNWwjWYklAAAAAElFTkSuQmCC');
+}
+
</ins><span class="cx"> /* ================== SPACER ====================== */
</span><span class="cx">
</span><span class="cx"> video::-webkit-media-controls-spacer,
</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 (181102 => 181103)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-03-05 22:28:41 UTC (rev 181102)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2015-03-05 22:47:13 UTC (rev 181103)
</span><span class="lines">@@ -141,11 +141,11 @@
</span><span class="cx"> this.controls.wirelessPlaybackStatus.setAttribute('aria-label', deviceType + ", " + deviceName);
</span><span class="cx">
</span><span class="cx"> this.controls.wirelessPlaybackStatus.classList.remove(this.ClassNames.hidden);
</span><del>- this.controls.wirelessTargetPicker.classList.add(this.ClassNames.active);
- } else {
</del><ins>+ this.controls.wirelessTargetPicker.classList.add(this.ClassNames.playing);
+ } else {
</ins><span class="cx"> this.controls.wirelessPlaybackStatus.classList.add(this.ClassNames.hidden);
</span><del>- this.controls.wirelessTargetPicker.classList.remove(this.ClassNames.active);
- }
</del><ins>+ this.controls.wirelessTargetPicker.classList.remove(this.ClassNames.playing);
+ }
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> updateWirelessTargetAvailable: function() {
</span></span></pre>
</div>
</div>
</body>
</html>