<!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>[208838] 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/208838">208838</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-16 21:46:32 -0800 (Wed, 16 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix build on macOS Sierra when WEB_PLAYBACK_CONTROLS_MANAGER is enabled
https://bugs.webkit.org/show_bug.cgi?id=164845
Reviewed by Dan Bernstein.
Revert <a href="http://trac.webkit.org/projects/webkit/changeset/208833">r208833</a> and fix the build by declaring AVFunctionBarMediaSelectionOption and AVThumbnail in AVKitSPI.h
* platform/mac/WebPlaybackControlsManager.h:
* platform/mac/WebPlaybackControlsManager.mm:
(-[WebPlaybackControlsManager generateFunctionBarAudioAmplitudeSamples:completionHandler:]):
* platform/mac/WebPlaybackSessionInterfaceMac.mm:
(WebCore::WebPlaybackSessionInterfaceMac::seekableRangesChanged):
(WebCore::WebPlaybackSessionInterfaceMac::audioMediaSelectionOptionsChanged):
(WebCore::WebPlaybackSessionInterfaceMac::legibleMediaSelectionOptionsChanged):
(WebCore::WebPlaybackSessionInterfaceMac::setPlayBackControlsManager):
* platform/spi/cocoa/AVKitSPI.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebPlaybackControlsManagerh">trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebPlaybackControlsManagermm">trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformmacWebPlaybackSessionInterfaceMacmm">trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaAVKitSPIh">trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208837 => 208838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-17 04:32:49 UTC (rev 208837)
+++ trunk/Source/WebCore/ChangeLog 2016-11-17 05:46:32 UTC (rev 208838)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-11-16 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ Fix build on macOS Sierra when WEB_PLAYBACK_CONTROLS_MANAGER is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=164845
+
+ Reviewed by Dan Bernstein.
+
+ Revert r208833 and fix the build by declaring AVFunctionBarMediaSelectionOption and AVThumbnail in AVKitSPI.h
+
+ * platform/mac/WebPlaybackControlsManager.h:
+ * platform/mac/WebPlaybackControlsManager.mm:
+ (-[WebPlaybackControlsManager generateFunctionBarAudioAmplitudeSamples:completionHandler:]):
+ * platform/mac/WebPlaybackSessionInterfaceMac.mm:
+ (WebCore::WebPlaybackSessionInterfaceMac::seekableRangesChanged):
+ (WebCore::WebPlaybackSessionInterfaceMac::audioMediaSelectionOptionsChanged):
+ (WebCore::WebPlaybackSessionInterfaceMac::legibleMediaSelectionOptionsChanged):
+ (WebCore::WebPlaybackSessionInterfaceMac::setPlayBackControlsManager):
+ * platform/spi/cocoa/AVKitSPI.h:
+
+2016-11-16 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> REGRESSION(r208082): 1% Speedometer regression on iOS
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=164852
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebPlaybackControlsManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h (208837 => 208838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h 2016-11-17 04:32:49 UTC (rev 208837)
+++ trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h 2016-11-17 05:46:32 UTC (rev 208838)
</span><span class="lines">@@ -46,12 +46,10 @@
</span><span class="cx"> RetainPtr<NSArray> _seekableTimeRanges;
</span><span class="cx"> BOOL _hasEnabledAudio;
</span><span class="cx"> BOOL _hasEnabledVideo;
</span><del>-#if USE(APPLE_INTERNAL_SDK)
</del><span class="cx"> RetainPtr<NSArray<AVFunctionBarMediaSelectionOption *>> _audioFunctionBarMediaSelectionOptions;
</span><span class="cx"> RetainPtr<AVFunctionBarMediaSelectionOption> _currentAudioFunctionBarMediaSelectionOption;
</span><span class="cx"> RetainPtr<NSArray<AVFunctionBarMediaSelectionOption *>> _legibleFunctionBarMediaSelectionOptions;
</span><span class="cx"> RetainPtr<AVFunctionBarMediaSelectionOption> _currentLegibleFunctionBarMediaSelectionOption;
</span><del>-#endif
</del><span class="cx"> float _rate;
</span><span class="cx"> BOOL _playing;
</span><span class="cx"> BOOL _canTogglePlayback;
</span><span class="lines">@@ -72,7 +70,6 @@
</span><span class="cx">
</span><span class="cx"> @property (nonatomic) float rate;
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
</del><span class="cx"> - (AVFunctionBarMediaSelectionOption *)currentAudioFunctionBarMediaSelectionOption;
</span><span class="cx"> - (void)setCurrentAudioFunctionBarMediaSelectionOption:(AVFunctionBarMediaSelectionOption *)option;
</span><span class="cx"> - (AVFunctionBarMediaSelectionOption *)currentLegibleFunctionBarMediaSelectionOption;
</span><span class="lines">@@ -79,7 +76,6 @@
</span><span class="cx"> - (void)setCurrentLegibleFunctionBarMediaSelectionOption:(AVFunctionBarMediaSelectionOption *)option;
</span><span class="cx"> - (void)setAudioMediaSelectionOptions:(const Vector<WTF::String>&)options withSelectedIndex:(NSUInteger)selectedIndex;
</span><span class="cx"> - (void)setLegibleMediaSelectionOptions:(const Vector<WTF::String>&)options withSelectedIndex:(NSUInteger)selectedIndex;
</span><del>-#endif
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebPlaybackControlsManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm (208837 => 208838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm 2016-11-17 04:32:49 UTC (rev 208837)
+++ trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm 2016-11-17 05:46:32 UTC (rev 208838)
</span><span class="lines">@@ -90,7 +90,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
</del><span class="cx"> - (void)generateFunctionBarThumbnailsForTimes:(NSArray<NSNumber *> *)thumbnailTimes size:(NSSize)size completionHandler:(void (^)(NSArray<AVThumbnail *> *thumbnails, NSError *error))completionHandler
</span><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(thumbnailTimes);
</span><span class="lines">@@ -103,7 +102,6 @@
</span><span class="cx"> UNUSED_PARAM(numberOfSamples);
</span><span class="cx"> completionHandler(@[ ], nil);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> -(BOOL)canBeginFunctionBarScrubbing
</span><span class="cx"> {
</span><span class="lines">@@ -123,7 +121,6 @@
</span><span class="cx"> _webPlaybackSessionInterfaceMac->endScrubbing();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
</del><span class="cx"> - (NSArray<AVFunctionBarMediaSelectionOption *> *)audioFunctionBarMediaSelectionOptions
</span><span class="cx"> {
</span><span class="cx"> return _audioFunctionBarMediaSelectionOptions.get();
</span><span class="lines">@@ -209,7 +206,7 @@
</span><span class="cx"> if (selectedIndex < [webOptions count])
</span><span class="cx"> [self setCurrentLegibleFunctionBarMediaSelectionOption:[webOptions objectAtIndex:selectedIndex]];
</span><span class="cx"> }
</span><del>-#endif
</del><ins>+
</ins><span class="cx"> - (WebCore::WebPlaybackSessionInterfaceMac*)webPlaybackSessionInterfaceMac
</span><span class="cx"> {
</span><span class="cx"> return _webPlaybackSessionInterfaceMac.get();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacWebPlaybackSessionInterfaceMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm (208837 => 208838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm 2016-11-17 04:32:49 UTC (rev 208837)
+++ trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm 2016-11-17 05:46:32 UTC (rev 208838)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionInterfaceMac::seekableRangesChanged(const TimeRanges& timeRanges)
</span><span class="cx"> {
</span><del>-#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER) && USE(APPLE_INTERNAL_SDK)
</del><ins>+#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
</ins><span class="cx"> [playBackControlsManager() setSeekableTimeRanges:timeRangesToArray(timeRanges).get()];
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(timeRanges);
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionInterfaceMac::audioMediaSelectionOptionsChanged(const Vector<WTF::String>& options, uint64_t selectedIndex)
</span><span class="cx"> {
</span><del>-#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER) && USE(APPLE_INTERNAL_SDK)
</del><ins>+#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
</ins><span class="cx"> [playBackControlsManager() setAudioMediaSelectionOptions:options withSelectedIndex:static_cast<NSUInteger>(selectedIndex)];
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(options);
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionInterfaceMac::legibleMediaSelectionOptionsChanged(const Vector<WTF::String>& options, uint64_t selectedIndex)
</span><span class="cx"> {
</span><del>-#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER) && USE(APPLE_INTERNAL_SDK)
</del><ins>+#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
</ins><span class="cx"> [playBackControlsManager() setLegibleMediaSelectionOptions:options withSelectedIndex:static_cast<NSUInteger>(selectedIndex)];
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(options);
</span><span class="lines">@@ -198,10 +198,8 @@
</span><span class="cx"> manager.seekableTimeRanges = timeRangesToArray(m_playbackSessionModel->seekableRanges()).get();
</span><span class="cx"> manager.canTogglePlayback = YES;
</span><span class="cx"> manager.playing = m_playbackSessionModel->isPlaying();
</span><del>-#if USE(APPLE_INTERNAL_SDK)
</del><span class="cx"> [manager setAudioMediaSelectionOptions:m_playbackSessionModel->audioMediaSelectionOptions() withSelectedIndex:static_cast<NSUInteger>(m_playbackSessionModel->audioMediaSelectedIndex())];
</span><span class="cx"> [manager setLegibleMediaSelectionOptions:m_playbackSessionModel->legibleMediaSelectionOptions() withSelectedIndex:static_cast<NSUInteger>(m_playbackSessionModel->legibleMediaSelectedIndex())];
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlaybackSessionInterfaceMac::updatePlaybackControlsManagerTiming(double currentTime, double anchorTime, double playbackRate, bool isPlaying)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaAVKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h (208837 => 208838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2016-11-17 04:32:49 UTC (rev 208837)
+++ trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h 2016-11-17 05:46:32 UTC (rev 208838)
</span><span class="lines">@@ -179,6 +179,9 @@
</span><span class="cx"> @property (assign, nullable) id<AVFunctionBarPlaybackControlsControlling> playbackControlsController;
</span><span class="cx"> @end
</span><span class="cx">
</span><ins>+@class AVFunctionBarMediaSelectionOption;
+@class AVThumbnail;
+
</ins><span class="cx"> NS_ASSUME_NONNULL_END
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>