<!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>[199184] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/199184">199184</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2016-04-07 14:31:55 -0700 (Thu, 07 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebPlaybackControlsManager should support mediaSelectionOptions
https://bugs.webkit.org/show_bug.cgi?id=156358
-and corresponding-
rdar://problem/25048743
Reviewed by Jer Noble.
This patch just implements
WebVideoFullscreenInterfaceMac::setAudioMediaSelectionOptions and
WebVideoFullscreenInterfaceMac::setLegibleMediaSelectionOptions and passes that
information on to WebPlaybackControlsManager. If selection options are set via
the WebPlaybackControlsManager, then it gets the webVideoFullscreenModel() to
set the new value.
* platform/mac/WebVideoFullscreenInterfaceMac.h:
* platform/mac/WebVideoFullscreenInterfaceMac.mm:
(-[WebPlaybackControlsManager currentAudioMediaSelectionOption]):
(-[WebPlaybackControlsManager setCurrentAudioMediaSelectionOption:]):
(-[WebPlaybackControlsManager currentLegibleMediaSelectionOption]):
(-[WebPlaybackControlsManager setCurrentLegibleMediaSelectionOption:]):
(WebCore::mediaSelectionOptions):
(WebCore::WebVideoFullscreenInterfaceMac::setAudioMediaSelectionOptions):
(WebCore::WebVideoFullscreenInterfaceMac::setLegibleMediaSelectionOptions):
(-[WebPlaybackControlsManager audioMediaSelectionOptions]): Deleted.
(-[WebPlaybackControlsManager legibleMediaSelectionOptions]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebVideoFullscreenInterfaceMach">trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebVideoFullscreenInterfaceMacmm">trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199183 => 199184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-07 21:26:16 UTC (rev 199183)
+++ trunk/Source/WebCore/ChangeLog 2016-04-07 21:31:55 UTC (rev 199184)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-04-07 Beth Dakin <bdakin@apple.com>
+
+ WebPlaybackControlsManager should support mediaSelectionOptions
+ https://bugs.webkit.org/show_bug.cgi?id=156358
+ -and corresponding-
+ rdar://problem/25048743
+
+ Reviewed by Jer Noble.
+
+ This patch just implements
+ WebVideoFullscreenInterfaceMac::setAudioMediaSelectionOptions and
+ WebVideoFullscreenInterfaceMac::setLegibleMediaSelectionOptions and passes that
+ information on to WebPlaybackControlsManager. If selection options are set via
+ the WebPlaybackControlsManager, then it gets the webVideoFullscreenModel() to
+ set the new value.
+
+ * platform/mac/WebVideoFullscreenInterfaceMac.h:
+ * platform/mac/WebVideoFullscreenInterfaceMac.mm:
+ (-[WebPlaybackControlsManager currentAudioMediaSelectionOption]):
+ (-[WebPlaybackControlsManager setCurrentAudioMediaSelectionOption:]):
+ (-[WebPlaybackControlsManager currentLegibleMediaSelectionOption]):
+ (-[WebPlaybackControlsManager setCurrentLegibleMediaSelectionOption:]):
+ (WebCore::mediaSelectionOptions):
+ (WebCore::WebVideoFullscreenInterfaceMac::setAudioMediaSelectionOptions):
+ (WebCore::WebVideoFullscreenInterfaceMac::setLegibleMediaSelectionOptions):
+ (-[WebPlaybackControlsManager audioMediaSelectionOptions]): Deleted.
+ (-[WebPlaybackControlsManager legibleMediaSelectionOptions]): Deleted.
+
</ins><span class="cx"> 2016-04-07 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Wheel event callback removing the window causes crash in WebCore.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebVideoFullscreenInterfaceMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h (199183 => 199184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h 2016-04-07 21:26:16 UTC (rev 199183)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h 2016-04-07 21:31:55 UTC (rev 199184)
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx"> WEBCORE_EXPORT void setVideoDimensions(bool hasVideo, float width, float height) final;
</span><span class="cx"> WEBCORE_EXPORT void setSeekableRanges(const TimeRanges&) override;
</span><span class="cx"> WEBCORE_EXPORT void setCanPlayFastReverse(bool) override { }
</span><del>- WEBCORE_EXPORT void setAudioMediaSelectionOptions(const Vector<WTF::String>& /*options*/, uint64_t /*selectedIndex*/) override { }
- WEBCORE_EXPORT void setLegibleMediaSelectionOptions(const Vector<WTF::String>& /*options*/, uint64_t /*selectedIndex*/) override { }
</del><ins>+ WEBCORE_EXPORT void setAudioMediaSelectionOptions(const Vector<WTF::String>& /*options*/, uint64_t /*selectedIndex*/) override;
+ WEBCORE_EXPORT void setLegibleMediaSelectionOptions(const Vector<WTF::String>& /*options*/, uint64_t /*selectedIndex*/) override;
</ins><span class="cx"> WEBCORE_EXPORT void setExternalPlayback(bool enabled, ExternalPlaybackTargetType, WTF::String localizedDeviceName) override;
</span><span class="cx"> WEBCORE_EXPORT void setWirelessVideoPlaybackDisabled(bool) override { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebVideoFullscreenInterfaceMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm (199183 => 199184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm 2016-04-07 21:26:16 UTC (rev 199183)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm 2016-04-07 21:31:55 UTC (rev 199184)
</span><span class="lines">@@ -48,6 +48,13 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><ins>+@interface WebAVMediaSelectionOptionMac : NSObject
+@property (retain) NSString *localizedDisplayName;
+@end
+
+@implementation WebAVMediaSelectionOptionMac
+@end
+
</ins><span class="cx"> @interface WebPlaybackControlsManager : NSObject {
</span><span class="cx"> NSTimeInterval _contentDuration;
</span><span class="cx"> AVValueTiming *_timing;
</span><span class="lines">@@ -67,6 +74,10 @@
</span><span class="cx"> @property (nonatomic, retain, readwrite) NSArray *seekableTimeRanges;
</span><span class="cx"> @property (readwrite) BOOL hasEnabledAudio;
</span><span class="cx"> @property (readwrite) BOOL hasEnabledVideo;
</span><ins>+@property (nonatomic, retain, readwrite) NSArray<AVMediaSelectionOption *> *audioMediaSelectionOptions;
+@property (nonatomic, retain, readwrite) AVMediaSelectionOption *currentAudioMediaSelectionOption;
+@property (nonatomic, retain, readwrite) NSArray<AVMediaSelectionOption *> *legibleMediaSelectionOptions;
+@property (nonatomic, retain, readwrite) AVMediaSelectionOption *currentLegibleMediaSelectionOption;
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic) float rate;
</span><span class="cx">
</span><span class="lines">@@ -87,6 +98,10 @@
</span><span class="cx"> @synthesize hasEnabledAudio=_hasEnabledAudio;
</span><span class="cx"> @synthesize hasEnabledVideo=_hasEnabledVideo;
</span><span class="cx"> @synthesize rate=_rate;
</span><ins>+@synthesize audioMediaSelectionOptions=_audioMediaSelectionOptions;
+@synthesize currentAudioMediaSelectionOption=_currentAudioMediaSelectionOption;
+@synthesize legibleMediaSelectionOptions=_legibleMediaSelectionOptions;
+@synthesize currentLegibleMediaSelectionOption=_currentLegibleMediaSelectionOption;
</ins><span class="cx">
</span><span class="cx"> - (instancetype)initWithWebVideoFullscreenInterfaceMac:(WebCore::WebVideoFullscreenInterfaceMac*)webVideoFullscreenInterfaceMac
</span><span class="cx"> {
</span><span class="lines">@@ -110,34 +125,44 @@
</span><span class="cx"> _webVideoFullscreenInterfaceMac->webVideoFullscreenModel()->seekToTime(time);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSArray *)audioMediaSelectionOptions
-{
- return @[];
-}
-
</del><span class="cx"> - (AVMediaSelectionOption *)currentAudioMediaSelectionOption
</span><span class="cx"> {
</span><del>- return nil;
</del><ins>+ return _currentAudioMediaSelectionOption;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setCurrentAudioMediaSelectionOption:(AVMediaSelectionOption *)audioMediaSelectionOption
</span><span class="cx"> {
</span><del>- UNUSED_PARAM(audioMediaSelectionOption);
</del><ins>+ if (audioMediaSelectionOption == _currentAudioMediaSelectionOption)
+ return;
+
+ _currentAudioMediaSelectionOption = audioMediaSelectionOption;
+
+ NSInteger index = NSNotFound;
+
+ if (audioMediaSelectionOption && self.audioMediaSelectionOptions)
+ index = [self.audioMediaSelectionOptions indexOfObject:audioMediaSelectionOption];
+
+ _webVideoFullscreenInterfaceMac->webVideoFullscreenModel()->selectAudioMediaOption(index != NSNotFound ? index : UINT64_MAX);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSArray *)legibleMediaSelectionOptions
-{
- return @[];
-}
-
</del><span class="cx"> - (AVMediaSelectionOption *)currentLegibleMediaSelectionOption
</span><span class="cx"> {
</span><del>- return nil;
</del><ins>+ return _currentLegibleMediaSelectionOption;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)setCurrentLegibleMediaSelectionOption:(AVMediaSelectionOption *)legibleMediaSelectionOption
</span><span class="cx"> {
</span><del>- UNUSED_PARAM(legibleMediaSelectionOption);
</del><ins>+ if (legibleMediaSelectionOption == _currentLegibleMediaSelectionOption)
+ return;
+
+ _currentLegibleMediaSelectionOption = legibleMediaSelectionOption;
+
+ NSInteger index = NSNotFound;
+
+ if (legibleMediaSelectionOption && self.legibleMediaSelectionOptions)
+ index = [self.legibleMediaSelectionOptions indexOfObject:legibleMediaSelectionOption];
+
+ _webVideoFullscreenInterfaceMac->webVideoFullscreenModel()->selectLegibleMediaOption(index != NSNotFound ? index : UINT64_MAX);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)cancelThumbnailAndAudioAmplitudeSampleGeneration
</span><span class="lines">@@ -236,6 +261,37 @@
</span><span class="cx"> [controlsManager setSeekableTimeRanges:seekableRanges.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RetainPtr<NSMutableArray> mediaSelectionOptions(const Vector<String>& options)
+{
+ RetainPtr<NSMutableArray> webOptions = adoptNS([[NSMutableArray alloc] initWithCapacity:options.size()]);
+ for (auto& name : options) {
+ RetainPtr<WebAVMediaSelectionOptionMac> webOption = adoptNS([[WebAVMediaSelectionOptionMac alloc] init]);
+ [webOption setLocalizedDisplayName:name];
+ [webOptions addObject:webOption.get()];
+ }
+ return webOptions;
+}
+
+void WebVideoFullscreenInterfaceMac::setAudioMediaSelectionOptions(const Vector<WTF::String>& options, uint64_t selectedIndex)
+{
+ WebPlaybackControlsManager* controlsManager = playBackControlsManager();
+
+ RetainPtr<NSMutableArray> webOptions = mediaSelectionOptions(options);
+ [controlsManager setAudioMediaSelectionOptions:webOptions.get()];
+ if (selectedIndex < [webOptions count])
+ [controlsManager setCurrentAudioMediaSelectionOption:[webOptions objectAtIndex:static_cast<NSUInteger>(selectedIndex)]];
+}
+
+void WebVideoFullscreenInterfaceMac::setLegibleMediaSelectionOptions(const Vector<WTF::String>& options, uint64_t selectedIndex)
+{
+ WebPlaybackControlsManager* controlsManager = playBackControlsManager();
+
+ RetainPtr<NSMutableArray> webOptions = mediaSelectionOptions(options);
+ [controlsManager setLegibleMediaSelectionOptions:webOptions.get()];
+ if (selectedIndex < [webOptions count])
+ [controlsManager setCurrentLegibleMediaSelectionOption:[webOptions objectAtIndex:static_cast<NSUInteger>(selectedIndex)]];
+}
+
</ins><span class="cx"> void WebVideoFullscreenInterfaceMac::ensureControlsManager()
</span><span class="cx"> {
</span><span class="cx"> playBackControlsManager();
</span></span></pre>
</div>
</div>
</body>
</html>