Title: [217803] trunk/Source
- Revision
- 217803
- Author
- [email protected]
- Date
- 2017-06-05 16:15:43 -0700 (Mon, 05 Jun 2017)
Log Message
Tried to fix the build when targrting macOS 10.12 using the macOS 10.13 developer beta SDK.
Source/WebCore:
* platform/mac/WebPlaybackControlsManager.h:
* platform/mac/WebPlaybackControlsManager.mm:
(-[WebPlaybackControlsManager togglePictureInPicture]):
Source/WebKit2:
* UIProcess/Cocoa/WebViewImpl.h:
* UIProcess/Cocoa/WebViewImpl.mm:
(WebKit::WebViewImpl::mediaPlaybackControlsView):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (217802 => 217803)
--- trunk/Source/WebCore/ChangeLog 2017-06-05 23:04:12 UTC (rev 217802)
+++ trunk/Source/WebCore/ChangeLog 2017-06-05 23:15:43 UTC (rev 217803)
@@ -2,6 +2,14 @@
Tried to fix the build when targrting macOS 10.12 using the macOS 10.13 developer beta SDK.
+ * platform/mac/WebPlaybackControlsManager.h:
+ * platform/mac/WebPlaybackControlsManager.mm:
+ (-[WebPlaybackControlsManager togglePictureInPicture]):
+
+2017-06-05 Dan Bernstein <[email protected]>
+
+ Tried to fix the build when targrting macOS 10.12 using the macOS 10.13 developer beta SDK.
+
* platform/spi/cocoa/AVKitSPI.h:
2017-06-05 Konstantin Tokarev <[email protected]>
Modified: trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h (217802 => 217803)
--- trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h 2017-06-05 23:04:12 UTC (rev 217802)
+++ trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h 2017-06-05 23:15:43 UTC (rev 217803)
@@ -37,7 +37,13 @@
#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
WEBCORE_EXPORT
-@interface WebPlaybackControlsManager : NSObject <AVTouchBarPlaybackControlsControlling> {
+@interface WebPlaybackControlsManager : NSObject
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
+ <AVTouchBarPlaybackControlsControlling>
+#else
+ <AVFunctionBarPlaybackControlsControlling>
+#endif
+{
@private
NSTimeInterval _contentDuration;
RetainPtr<AVValueTiming> _timing;
Modified: trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm (217802 => 217803)
--- trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm 2017-06-05 23:04:12 UTC (rev 217802)
+++ trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm 2017-06-05 23:15:43 UTC (rev 217803)
@@ -338,15 +338,14 @@
return NO;
}
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
- (void)togglePictureInPicture
{
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
if (_webPlaybackSessionInterfaceMac && _webPlaybackSessionInterfaceMac->webPlaybackSessionModel())
_webPlaybackSessionInterfaceMac->webPlaybackSessionModel()->togglePictureInPicture();
+}
#endif
-}
-
#pragma clang diagnostic pop
@end
Modified: trunk/Source/WebKit2/ChangeLog (217802 => 217803)
--- trunk/Source/WebKit2/ChangeLog 2017-06-05 23:04:12 UTC (rev 217802)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-05 23:15:43 UTC (rev 217803)
@@ -1,3 +1,11 @@
+2017-06-05 Dan Bernstein <[email protected]>
+
+ Tried to fix the build when targrting macOS 10.12 using the macOS 10.13 developer beta SDK.
+
+ * UIProcess/Cocoa/WebViewImpl.h:
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::mediaPlaybackControlsView):
+
2017-06-05 Jer Noble <[email protected]>
Allow clients to specify a list of codecs which should require hardware decode support.
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h (217802 => 217803)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2017-06-05 23:04:12 UTC (rev 217802)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.h 2017-06-05 23:15:43 UTC (rev 217803)
@@ -516,8 +516,12 @@
NSTouchBar *currentTouchBar() const { return m_currentTouchBar.get(); }
NSCandidateListTouchBarItem *candidateListTouchBarItem() const;
#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
AVTouchBarScrubber *mediaPlaybackControlsView() const;
+#else
+ AVFunctionBarScrubber *mediaPlaybackControlsView() const;
#endif
+#endif
NSTouchBar *textTouchBar() const;
void dismissTextTouchBarPopoverItemWithIdentifier(NSString *);
@@ -555,8 +559,13 @@
RetainPtr<NSCustomTouchBarItem> m_exitFullScreenButton;
#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
RetainPtr<AVTouchBarPlaybackControlsProvider> m_mediaTouchBarProvider;
RetainPtr<AVTouchBarScrubber> m_mediaPlaybackControlsView;
+#else
+ RetainPtr<AVFunctionBarPlaybackControlsProvider> m_mediaTouchBarProvider;
+ RetainPtr<AVFunctionBarScrubber> m_mediaPlaybackControlsView;
+#endif
#endif // ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
#endif // HAVE(TOUCH_BAR)
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (217802 => 217803)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-06-05 23:04:12 UTC (rev 217802)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2017-06-05 23:15:43 UTC (rev 217803)
@@ -919,7 +919,11 @@
}
#if ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
AVTouchBarScrubber *WebViewImpl::mediaPlaybackControlsView() const
+#else
+AVFunctionBarScrubber *WebViewImpl::mediaPlaybackControlsView() const
+#endif
{
if (m_page->hasActiveVideoForControlsManager())
return m_mediaPlaybackControlsView.get();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
