<!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>[199827] 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/199827">199827</a></dd>
<dt>Author</dt> <dd>bdakin@apple.com</dd>
<dt>Date</dt> <dd>2016-04-21 12:36:36 -0700 (Thu, 21 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove reliance on WebAVMediaSelectionOptionMac for the
WebPlaybackControlsManager
https://bugs.webkit.org/show_bug.cgi?id=156811
-and corresponding-
rdar://problem/25760523
Reviewed by Jer Noble.
* platform/mac/WebPlaybackSessionInterfaceMac.mm:
(-[WebPlaybackControlsManager setSeekableTimeRanges:]):
(-[WebPlaybackControlsManager setAudioMediaSelectionOptions:withSelectedIndex:]):
(-[WebPlaybackControlsManager setLegibleMediaSelectionOptions:withSelectedIndex:]):
(WebCore::WebPlaybackSessionInterfaceMac::~WebPlaybackSessionInterfaceMac):
(WebCore::WebPlaybackSessionInterfaceMac::setSeekableRanges):
(WebCore::WebPlaybackSessionInterfaceMac::setAudioMediaSelectionOptions):
(WebCore::WebPlaybackSessionInterfaceMac::setLegibleMediaSelectionOptions):
(WebCore::WebPlaybackSessionInterfaceMac::invalidate):
(-[WebAVMediaSelectionOptionMac localizedDisplayName]): Deleted.
(-[WebAVMediaSelectionOptionMac setLocalizedDisplayName:]): Deleted.
(-[WebPlaybackControlsManager isSeeking]): Deleted.
(-[WebPlaybackControlsManager seekToTime:toleranceBefore:toleranceAfter:]): Deleted.
(-[WebPlaybackControlsManager audioMediaSelectionOptions]): Deleted.
(-[WebPlaybackControlsManager setAudioMediaSelectionOptions:]): Deleted.
(-[WebPlaybackControlsManager currentAudioMediaSelectionOption]): Deleted.
(-[WebPlaybackControlsManager setCurrentAudioMediaSelectionOption:]): Deleted.
(-[WebPlaybackControlsManager legibleMediaSelectionOptions]): Deleted.
(-[WebPlaybackControlsManager setLegibleMediaSelectionOptions:]): Deleted.
(-[WebPlaybackControlsManager currentLegibleMediaSelectionOption]): Deleted.
(-[WebPlaybackControlsManager setCurrentLegibleMediaSelectionOption:]): Deleted.
(-[WebPlaybackControlsManager cancelThumbnailAndAudioAmplitudeSampleGeneration]): Deleted.
(WebCore::mediaSelectionOptions): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebPlaybackSessionInterfaceMacmm">trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (199826 => 199827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-21 19:03:23 UTC (rev 199826)
+++ trunk/Source/WebCore/ChangeLog 2016-04-21 19:36:36 UTC (rev 199827)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2016-04-21 Beth Dakin <bdakin@apple.com>
+
+ Remove reliance on WebAVMediaSelectionOptionMac for the
+ WebPlaybackControlsManager
+ https://bugs.webkit.org/show_bug.cgi?id=156811
+ -and corresponding-
+ rdar://problem/25760523
+
+ Reviewed by Jer Noble.
+
+ * platform/mac/WebPlaybackSessionInterfaceMac.mm:
+ (-[WebPlaybackControlsManager setSeekableTimeRanges:]):
+ (-[WebPlaybackControlsManager setAudioMediaSelectionOptions:withSelectedIndex:]):
+ (-[WebPlaybackControlsManager setLegibleMediaSelectionOptions:withSelectedIndex:]):
+ (WebCore::WebPlaybackSessionInterfaceMac::~WebPlaybackSessionInterfaceMac):
+ (WebCore::WebPlaybackSessionInterfaceMac::setSeekableRanges):
+ (WebCore::WebPlaybackSessionInterfaceMac::setAudioMediaSelectionOptions):
+ (WebCore::WebPlaybackSessionInterfaceMac::setLegibleMediaSelectionOptions):
+ (WebCore::WebPlaybackSessionInterfaceMac::invalidate):
+ (-[WebAVMediaSelectionOptionMac localizedDisplayName]): Deleted.
+ (-[WebAVMediaSelectionOptionMac setLocalizedDisplayName:]): Deleted.
+ (-[WebPlaybackControlsManager isSeeking]): Deleted.
+ (-[WebPlaybackControlsManager seekToTime:toleranceBefore:toleranceAfter:]): Deleted.
+ (-[WebPlaybackControlsManager audioMediaSelectionOptions]): Deleted.
+ (-[WebPlaybackControlsManager setAudioMediaSelectionOptions:]): Deleted.
+ (-[WebPlaybackControlsManager currentAudioMediaSelectionOption]): Deleted.
+ (-[WebPlaybackControlsManager setCurrentAudioMediaSelectionOption:]): Deleted.
+ (-[WebPlaybackControlsManager legibleMediaSelectionOptions]): Deleted.
+ (-[WebPlaybackControlsManager setLegibleMediaSelectionOptions:]): Deleted.
+ (-[WebPlaybackControlsManager currentLegibleMediaSelectionOption]): Deleted.
+ (-[WebPlaybackControlsManager setCurrentLegibleMediaSelectionOption:]): Deleted.
+ (-[WebPlaybackControlsManager cancelThumbnailAndAudioAmplitudeSampleGeneration]): Deleted.
+ (WebCore::mediaSelectionOptions): Deleted.
+
</ins><span class="cx"> 2016-04-21 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(198782): ImageSource::subsamplingLevelForScale() does not cache the MaximumSubsamplingLevel for this ImageSource
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebPlaybackSessionInterfaceMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm (199826 => 199827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm 2016-04-21 19:03:23 UTC (rev 199826)
+++ trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm 2016-04-21 19:36:36 UTC (rev 199827)
</span><span class="lines">@@ -42,38 +42,15 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-@interface WebAVMediaSelectionOptionMac : NSObject {
- RetainPtr<NSString> _localizedDisplayName;
-}
-@property (retain) NSString *localizedDisplayName;
-@end
-
-@implementation WebAVMediaSelectionOptionMac
-
-- (NSString *)localizedDisplayName
-{
- return _localizedDisplayName.get();
-}
-
-- (void)setLocalizedDisplayName:(NSString *)name
-{
- _localizedDisplayName = name;
-}
-
-@end
-
-@interface WebPlaybackControlsManager : NSObject {
</del><ins>+#if USE(APPLE_INTERNAL_SDK) && ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
+#import <WebKitAdditions/WebPlaybackControlsControllerAdditions.mm>
+#else
+@interface WebPlaybackControlsManager : NSObject<AVFunctionBarPlaybackControlsControlling> {
</ins><span class="cx"> NSTimeInterval _contentDuration;
</span><span class="cx"> RetainPtr<AVValueTiming> _timing;
</span><del>- NSTimeInterval _seekToTime;
</del><span class="cx"> RetainPtr<NSArray> _seekableTimeRanges;
</span><span class="cx"> BOOL _hasEnabledAudio;
</span><span class="cx"> BOOL _hasEnabledVideo;
</span><del>- RetainPtr<NSArray<AVMediaSelectionOption *>> _audioMediaSelectionOptions;
- RetainPtr<AVMediaSelectionOption> _currentAudioMediaSelectionOption;
- RetainPtr<NSArray<AVMediaSelectionOption *>> _legibleMediaSelectionOptions;
- RetainPtr<AVMediaSelectionOption> _currentLegibleMediaSelectionOption;
-
</del><span class="cx"> float _rate;
</span><span class="cx">
</span><span class="cx"> @private
</span><span class="lines">@@ -82,29 +59,18 @@
</span><span class="cx">
</span><span class="cx"> @property (readwrite) NSTimeInterval contentDuration;
</span><span class="cx"> @property (nonatomic, retain, readwrite) AVValueTiming *timing;
</span><del>-@property NSTimeInterval seekToTime;
</del><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><del>-@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;
-
</del><span class="cx"> @property (nonatomic) float rate;
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithWebPlaybackSessionInterfaceMac:(WebCore::WebPlaybackSessionInterfaceMac*)webPlaybackSessionInterfaceMac;
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebPlaybackControlsControllerAdditions.mm>
-#endif
-
</del><span class="cx"> @implementation WebPlaybackControlsManager
</span><span class="cx">
</span><span class="cx"> @synthesize contentDuration=_contentDuration;
</span><del>-@synthesize seekToTime=_seekToTime;
</del><span class="cx"> @synthesize hasEnabledAudio=_hasEnabledAudio;
</span><span class="cx"> @synthesize hasEnabledVideo=_hasEnabledVideo;
</span><span class="cx"> @synthesize rate=_rate;
</span><span class="lines">@@ -139,88 +105,22 @@
</span><span class="cx"> _seekableTimeRanges = timeRanges;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (BOOL)isSeeking
</del><ins>+- (void)setAudioMediaSelectionOptions:(const Vector<WTF::String>&)options withSelectedIndex:(NSUInteger)selectedIndex
</ins><span class="cx"> {
</span><del>- return NO;
</del><ins>+ UNUSED_PARAM(options);
+ UNUSED_PARAM(selectedIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)seekToTime:(NSTimeInterval)time toleranceBefore:(NSTimeInterval)toleranceBefore toleranceAfter:(NSTimeInterval)toleranceAfter
</del><ins>+- (void)setLegibleMediaSelectionOptions:(const Vector<WTF::String>&)options withSelectedIndex:(NSUInteger)selectedIndex
</ins><span class="cx"> {
</span><del>- UNUSED_PARAM(toleranceBefore);
- UNUSED_PARAM(toleranceAfter);
- _webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->seekToTime(time);
</del><ins>+ UNUSED_PARAM(options);
+ UNUSED_PARAM(selectedIndex);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-- (NSArray<AVMediaSelectionOption *> *)audioMediaSelectionOptions
-{
- return _audioMediaSelectionOptions.get();
-}
</del><ins>+@end
</ins><span class="cx">
</span><del>-- (void)setAudioMediaSelectionOptions:(NSArray<AVMediaSelectionOption *> *)audioOptions
-{
- _audioMediaSelectionOptions = audioOptions;
-}
-
-- (AVMediaSelectionOption *)currentAudioMediaSelectionOption
-{
- return _currentAudioMediaSelectionOption.get();
-}
-
-- (void)setCurrentAudioMediaSelectionOption:(AVMediaSelectionOption *)audioMediaSelectionOption
-{
- if (audioMediaSelectionOption == _currentAudioMediaSelectionOption)
- return;
-
- _currentAudioMediaSelectionOption = audioMediaSelectionOption;
-
- NSInteger index = NSNotFound;
-
- if (audioMediaSelectionOption && self.audioMediaSelectionOptions)
- index = [self.audioMediaSelectionOptions indexOfObject:audioMediaSelectionOption];
-
- _webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->selectAudioMediaOption(index != NSNotFound ? index : UINT64_MAX);
-}
-
-- (NSArray<AVMediaSelectionOption *> *)legibleMediaSelectionOptions
-{
- return _legibleMediaSelectionOptions.get();
-}
-
-- (void)setLegibleMediaSelectionOptions:(NSArray<AVMediaSelectionOption *> *)legibleOptions
-{
- _legibleMediaSelectionOptions = legibleOptions;
-}
-
-- (AVMediaSelectionOption *)currentLegibleMediaSelectionOption
-{
- return _currentLegibleMediaSelectionOption.get();
-}
-
-- (void)setCurrentLegibleMediaSelectionOption:(AVMediaSelectionOption *)legibleMediaSelectionOption
-{
- if (legibleMediaSelectionOption == _currentLegibleMediaSelectionOption)
- return;
-
- _currentLegibleMediaSelectionOption = legibleMediaSelectionOption;
-
- NSInteger index = NSNotFound;
-
- if (legibleMediaSelectionOption && self.legibleMediaSelectionOptions)
- index = [self.legibleMediaSelectionOptions indexOfObject:legibleMediaSelectionOption];
-
- _webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->selectLegibleMediaOption(index != NSNotFound ? index : UINT64_MAX);
-}
-
-- (void)cancelThumbnailAndAudioAmplitudeSampleGeneration
-{
-}
-
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebPlaybackControlsControllerThumbnailAdditions.mm>
</del><span class="cx"> #endif
</span><span class="cx">
</span><del>-@end
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> WebPlaybackSessionInterfaceMac::~WebPlaybackSessionInterfaceMac()
</span><span class="lines">@@ -276,35 +176,16 @@
</span><span class="cx"> [controlsManager setSeekableTimeRanges:seekableRanges.get()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> void WebPlaybackSessionInterfaceMac::setAudioMediaSelectionOptions(const Vector<WTF::String>& options, uint64_t selectedIndex)
</span><span class="cx"> {
</span><span class="cx"> WebPlaybackControlsManager* controlsManager = playBackControlsManager();
</span><del>-
- RetainPtr<NSMutableArray> webOptions = mediaSelectionOptions(options);
- [controlsManager setAudioMediaSelectionOptions:webOptions.get()];
- if (selectedIndex < [webOptions count])
- [controlsManager setCurrentAudioMediaSelectionOption:[webOptions objectAtIndex:static_cast<NSUInteger>(selectedIndex)]];
</del><ins>+ [controlsManager setAudioMediaSelectionOptions:options withSelectedIndex:selectedIndex];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionInterfaceMac::setLegibleMediaSelectionOptions(const Vector<WTF::String>& options, uint64_t selectedIndex)
</span><span class="cx"> {
</span><span class="cx"> WebPlaybackControlsManager* controlsManager = playBackControlsManager();
</span><del>-
- RetainPtr<NSMutableArray> webOptions = mediaSelectionOptions(options);
- [controlsManager setLegibleMediaSelectionOptions:webOptions.get()];
- if (selectedIndex < [webOptions count])
- [controlsManager setCurrentLegibleMediaSelectionOption:[webOptions objectAtIndex:static_cast<NSUInteger>(selectedIndex)]];
</del><ins>+ [controlsManager setLegibleMediaSelectionOptions:options withSelectedIndex:selectedIndex];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionInterfaceMac::invalidate()
</span></span></pre>
</div>
</div>
</body>
</html>