<!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>[176103] tags/Safari-601.1.9/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/176103">176103</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2014-11-13 16:10:11 -0800 (Thu, 13 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/176090">r176090</a>. rdar://problem/18963531</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari60119SourceWebCoreChangeLog">tags/Safari-601.1.9/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari60119SourceWebCoreModulesmediacontrolsMediaControlsHostcpp">tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp</a></li>
<li><a href="#tagsSafari60119SourceWebCoreModulesmediacontrolsMediaControlsHostidl">tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl</a></li>
<li><a href="#tagsSafari60119SourceWebCoreModulesmediacontrolsmediaControlsApplejs">tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js</a></li>
<li><a href="#tagsSafari60119SourceWebCoreModulesmediacontrolsmediaControlsiOSjs">tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js</a></li>
<li><a href="#tagsSafari60119SourceWebCoreplatformiosWebCoreSystemInterfaceIOSh">tags/Safari-601.1.9/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h</a></li>
<li><a href="#tagsSafari60119SourceWebCorerenderingRenderThemeIOSmm">tags/Safari-601.1.9/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari60119SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.9/Source/WebCore/ChangeLog (176102 => 176103)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.9/Source/WebCore/ChangeLog 2014-11-13 23:50:08 UTC (rev 176102)
+++ tags/Safari-601.1.9/Source/WebCore/ChangeLog 2014-11-14 00:10:11 UTC (rev 176103)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-11-13 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r176090.
+
+ 2014-11-13 Eric Carlson <eric.carlson@apple.com>
+
+ [iOS] update optimized fullscreen media controls artwork
+ https://bugs.webkit.org/show_bug.cgi?id=138705
+
+ Reviewed by Dean Jackson.
+
+ * Modules/mediacontrols/MediaControlsHost.cpp:
+ (WebCore::MediaControlsHost::mediaUIImageData): Remove one button.
+ * Modules/mediacontrols/MediaControlsHost.idl:
+
+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.controlsAreHidden): Add parentheses to fix the logic.
+
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.shouldHaveStartPlaybackButton): The big play button should not be
+ visible during playback.
+ (ControllerIOS.prototype.createControls): No longer necessary to insert style dynamically,
+ (ControllerIOS.prototype.setPlaying): Call the base class first so "isPlaying" is set before
+ calling updateControls, which calls shouldHaveStartPlaybackButton.
+
+ * platform/ios/WebCoreSystemInterfaceIOS.h: Update constants.
+
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::RenderThemeIOS::mediaControlsStyleSheet): Add button style to the media controls sheet.
+
</ins><span class="cx"> 2014-11-11 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove IncrementalSweeper::create()
</span></span></pre></div>
<a id="tagsSafari60119SourceWebCoreModulesmediacontrolsMediaControlsHostcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp (176102 => 176103)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2014-11-13 23:50:08 UTC (rev 176102)
+++ tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp 2014-11-14 00:10:11 UTC (rev 176103)
</span><span class="lines">@@ -318,9 +318,6 @@
</span><span class="cx"> if (partID == "optimized-fullscreen-button")
</span><span class="cx"> return wkGetMediaUIImageData(wkMediaUIPartOptimizedFullscreenButton);
</span><span class="cx">
</span><del>- if (partID == "optimized-fullscreen-button-hilited")
- return wkGetMediaUIImageData(wkMediaUIPartOptimizedFullscreenButtonHilited);
-
</del><span class="cx"> if (partID == "optimized-fullscreen-placeholder")
</span><span class="cx"> return wkGetMediaUIImageData(wkMediaUIPartOptimizedFullscreenPlaceholder);
</span><span class="cx"> #else
</span></span></pre></div>
<a id="tagsSafari60119SourceWebCoreModulesmediacontrolsMediaControlsHostidl"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl (176102 => 176103)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2014-11-13 23:50:08 UTC (rev 176102)
+++ tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/MediaControlsHost.idl 2014-11-14 00:10:11 UTC (rev 176103)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx">
</span><span class="cx"> enum MediaUIPartID {
</span><span class="cx"> "optimized-fullscreen-button",
</span><del>- "optimized-fullscreen-button-hilited",
</del><span class="cx"> "optimized-fullscreen-placeholder"
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="tagsSafari60119SourceWebCoreModulesmediacontrolsmediaControlsApplejs"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js (176102 => 176103)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-11-13 23:50:08 UTC (rev 176102)
+++ tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/mediaControlsApple.js 2014-11-14 00:10:11 UTC (rev 176103)
</span><span class="lines">@@ -1048,7 +1048,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.show) || 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="tagsSafari60119SourceWebCoreModulesmediacontrolsmediaControlsiOSjs"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js (176102 => 176103)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-11-13 23:50:08 UTC (rev 176102)
+++ tags/Safari-601.1.9/Source/WebCore/Modules/mediacontrols/mediaControlsiOS.js 2014-11-14 00:10:11 UTC (rev 176103)
</span><span class="lines">@@ -65,6 +65,9 @@
</span><span class="cx"> shouldHaveStartPlaybackButton: function() {
</span><span class="cx"> var allowsInline = this.host.mediaPlaybackAllowsInline;
</span><span class="cx">
</span><ins>+ if (this.isPlaying)
+ return false;
+
</ins><span class="cx"> if (this.isAudio() && allowsInline)
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="lines">@@ -148,12 +151,6 @@
</span><span class="cx"> inlinePlaybackPlaceholder.classList.add(this.ClassNames.hidden);
</span><span class="cx"> inlinePlaybackPlaceholder.setAttribute('aria-label', this.UIString('Display Optimized Full Screen'));
</span><span class="cx">
</span><del>- var buttonImageSVG = "background-image: url('" + this.host.mediaUIImageData("optimized-fullscreen-button") + "')";
- document.styleSheets[0].insertRule('video::-webkit-media-controls-optimized-fullscreen-button { ' + buttonImageSVG + '; }', 0);
-
- buttonImageSVG = "background-image: url('" + this.host.mediaUIImageData("optimized-fullscreen-button-hilited") + "')";
- document.styleSheets[0].insertRule('video::-webkit-media-controls-optimized-fullscreen-button:active { ' + buttonImageSVG + '; }', 0);
-
</del><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">@@ -543,8 +540,8 @@
</span><span class="cx">
</span><span class="cx"> setPlaying: function(isPlaying)
</span><span class="cx"> {
</span><del>- this.updateControls();
</del><span class="cx"> Controller.prototype.setPlaying.call(this, isPlaying);
</span><ins>+ this.updateControls();
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> setShouldListenForPlaybackTargetAvailabilityEvent: function(shouldListen)
</span></span></pre></div>
<a id="tagsSafari60119SourceWebCoreplatformiosWebCoreSystemInterfaceIOSh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.9/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h (176102 => 176103)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.9/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h 2014-11-13 23:50:08 UTC (rev 176102)
+++ tags/Safari-601.1.9/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.h 2014-11-14 00:10:11 UTC (rev 176103)
</span><span class="lines">@@ -77,7 +77,6 @@
</span><span class="cx">
</span><span class="cx"> typedef enum {
</span><span class="cx"> wkMediaUIPartOptimizedFullscreenButton = 0,
</span><del>- wkMediaUIPartOptimizedFullscreenButtonHilited,
</del><span class="cx"> wkMediaUIPartOptimizedFullscreenPlaceholder
</span><span class="cx"> } wkMediaUIPart;
</span><span class="cx"> extern CFStringRef (*wkGetMediaUIImageData)(int wkMediaUIPart);
</span></span></pre></div>
<a id="tagsSafari60119SourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.9/Source/WebCore/rendering/RenderThemeIOS.mm (176102 => 176103)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.9/Source/WebCore/rendering/RenderThemeIOS.mm 2014-11-13 23:50:08 UTC (rev 176102)
+++ tags/Safari-601.1.9/Source/WebCore/rendering/RenderThemeIOS.mm 2014-11-14 00:10:11 UTC (rev 176103)
</span><span class="lines">@@ -1251,8 +1251,12 @@
</span><span class="cx"> String RenderThemeIOS::mediaControlsStyleSheet()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(MEDIA_CONTROLS_SCRIPT)
</span><del>- if (m_mediaControlsStyleSheet.isEmpty())
- m_mediaControlsStyleSheet = [NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsiOS" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil];
</del><ins>+ if (m_mediaControlsStyleSheet.isEmpty()) {
+ StringBuilder builder;
+ builder.append([NSString stringWithContentsOfFile:[[NSBundle bundleForClass:[WebCoreRenderThemeBundle class]] pathForResource:@"mediaControlsiOS" ofType:@"css"] encoding:NSUTF8StringEncoding error:nil]);
+ builder.append(wkGetMediaUIImageData(wkMediaUIPartOptimizedFullscreenButton));
+ m_mediaControlsStyleSheet = builder.toString();
+ }
</ins><span class="cx"> return m_mediaControlsStyleSheet;
</span><span class="cx"> #else
</span><span class="cx"> return emptyString();
</span></span></pre>
</div>
</div>
</body>
</html>