Diff
Modified: branches/safari-610.1.11-branch/Source/_javascript_Core/ChangeLog (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/_javascript_Core/ChangeLog 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/_javascript_Core/ChangeLog 2020-04-25 00:52:38 UTC (rev 260688)
@@ -1,5 +1,62 @@
2020-04-24 Alan Coon <[email protected]>
+ Cherry-pick r260486. rdar://problem/62349885
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebCore:
+
+ No new tests, no functional change.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ * UIProcess/API/ios/WKWebViewIOS.mm:
+ (-[WKWebView _isShowingVideoPictureInPicture]):
+ (-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationDidBecomeActive):
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WTF:
+
+ * wtf/PlatformEnable.h:
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-21 Peng Liu <[email protected]>
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2020-04-24 Alan Coon <[email protected]>
+
Cherry-pick r260412. rdar://problem/62349885
Fix build failures when video fullscreen and picture-in-picture is disabled
Modified: branches/safari-610.1.11-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2020-04-25 00:52:38 UTC (rev 260688)
@@ -376,6 +376,7 @@
ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
Modified: branches/safari-610.1.11-branch/Source/WTF/ChangeLog (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/WTF/ChangeLog 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/WTF/ChangeLog 2020-04-25 00:52:38 UTC (rev 260688)
@@ -1,5 +1,62 @@
2020-04-24 Alan Coon <[email protected]>
+ Cherry-pick r260486. rdar://problem/62349885
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebCore:
+
+ No new tests, no functional change.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ * UIProcess/API/ios/WKWebViewIOS.mm:
+ (-[WKWebView _isShowingVideoPictureInPicture]):
+ (-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationDidBecomeActive):
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WTF:
+
+ * wtf/PlatformEnable.h:
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-21 Peng Liu <[email protected]>
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ * wtf/PlatformEnable.h:
+
+2020-04-24 Alan Coon <[email protected]>
+
Cherry-pick r260412. rdar://problem/62349885
Fix build failures when video fullscreen and picture-in-picture is disabled
Modified: branches/safari-610.1.11-branch/Source/WTF/wtf/PlatformEnable.h (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/WTF/wtf/PlatformEnable.h 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/WTF/wtf/PlatformEnable.h 2020-04-25 00:52:38 UTC (rev 260688)
@@ -270,7 +270,7 @@
#define ENABLE_FULLSCREEN_API 0
#endif
-#if ((PLATFORM(IOS) || PLATFORM(WATCHOS)) && HAVE(AVKIT)) || PLATFORM(MAC)
+#if ((PLATFORM(IOS) || PLATFORM(WATCHOS) || PLATFORM(MACCATALYST)) && HAVE(AVKIT)) || PLATFORM(MAC)
#if !defined(ENABLE_VIDEO_PRESENTATION_MODE)
#define ENABLE_VIDEO_PRESENTATION_MODE 1
#endif
Modified: branches/safari-610.1.11-branch/Source/WebCore/ChangeLog (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/WebCore/ChangeLog 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/WebCore/ChangeLog 2020-04-25 00:52:38 UTC (rev 260688)
@@ -1,5 +1,65 @@
2020-04-24 Alan Coon <[email protected]>
+ Cherry-pick r260486. rdar://problem/62349885
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebCore:
+
+ No new tests, no functional change.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ * UIProcess/API/ios/WKWebViewIOS.mm:
+ (-[WKWebView _isShowingVideoPictureInPicture]):
+ (-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationDidBecomeActive):
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WTF:
+
+ * wtf/PlatformEnable.h:
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-21 Peng Liu <[email protected]>
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ No new tests, no functional change.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+
+2020-04-24 Alan Coon <[email protected]>
+
Cherry-pick r260412. rdar://problem/62349885
Fix build failures when video fullscreen and picture-in-picture is disabled
Modified: branches/safari-610.1.11-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/WebCore/Configurations/FeatureDefines.xcconfig 2020-04-25 00:52:38 UTC (rev 260688)
@@ -376,6 +376,7 @@
ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
Modified: branches/safari-610.1.11-branch/Source/WebCore/PAL/ChangeLog (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/WebCore/PAL/ChangeLog 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/WebCore/PAL/ChangeLog 2020-04-25 00:52:38 UTC (rev 260688)
@@ -1,5 +1,62 @@
2020-04-24 Alan Coon <[email protected]>
+ Cherry-pick r260486. rdar://problem/62349885
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebCore:
+
+ No new tests, no functional change.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ * UIProcess/API/ios/WKWebViewIOS.mm:
+ (-[WKWebView _isShowingVideoPictureInPicture]):
+ (-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationDidBecomeActive):
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WTF:
+
+ * wtf/PlatformEnable.h:
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-21 Peng Liu <[email protected]>
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2020-04-24 Alan Coon <[email protected]>
+
Cherry-pick r260412. rdar://problem/62349885
Fix build failures when video fullscreen and picture-in-picture is disabled
Modified: branches/safari-610.1.11-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2020-04-25 00:52:38 UTC (rev 260688)
@@ -376,6 +376,7 @@
ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
Modified: branches/safari-610.1.11-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2020-04-25 00:52:38 UTC (rev 260688)
@@ -47,7 +47,7 @@
using namespace WebCore;
-#if !HAVE(AVKIT)
+#if !(ENABLE(VIDEO_PRESENTATION_MODE) && HAVE(AVKIT))
@implementation WebVideoFullscreenController
- (void)setVideoElement:(NakedPtr<WebCore::HTMLVideoElement>)videoElement
Modified: branches/safari-610.1.11-branch/Source/WebKit/ChangeLog (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/WebKit/ChangeLog 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/WebKit/ChangeLog 2020-04-25 00:52:38 UTC (rev 260688)
@@ -1,5 +1,67 @@
2020-04-24 Alan Coon <[email protected]>
+ Cherry-pick r260486. rdar://problem/62349885
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebCore:
+
+ No new tests, no functional change.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ * UIProcess/API/ios/WKWebViewIOS.mm:
+ (-[WKWebView _isShowingVideoPictureInPicture]):
+ (-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationDidBecomeActive):
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WTF:
+
+ * wtf/PlatformEnable.h:
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-21 Peng Liu <[email protected]>
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * UIProcess/API/ios/WKWebViewIOS.mm:
+ (-[WKWebView _isShowingVideoPictureInPicture]):
+ (-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationDidBecomeActive):
+
+2020-04-24 Alan Coon <[email protected]>
+
Cherry-pick r260412. rdar://problem/62349885
Fix build failures when video fullscreen and picture-in-picture is disabled
Modified: branches/safari-610.1.11-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/WebKit/Configurations/FeatureDefines.xcconfig 2020-04-25 00:52:38 UTC (rev 260688)
@@ -376,6 +376,7 @@
ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
Modified: branches/safari-610.1.11-branch/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2020-04-25 00:52:38 UTC (rev 260688)
@@ -176,25 +176,25 @@
- (BOOL)_isShowingVideoPictureInPicture
{
-#if !HAVE(AVKIT)
- return false;
-#else
+#if ENABLE(VIDEO_PRESENTATION_MODE)
if (!_page || !_page->videoFullscreenManager())
return false;
return _page->videoFullscreenManager()->hasMode(WebCore::HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
+#else
+ return false;
#endif
}
- (BOOL)_mayAutomaticallyShowVideoPictureInPicture
{
-#if !HAVE(AVKIT)
- return false;
-#else
+#if ENABLE(VIDEO_PRESENTATION_MODE)
if (!_page || !_page->videoFullscreenManager())
return false;
return _page->videoFullscreenManager()->mayAutomaticallyShowVideoPictureInPicture();
+#else
+ return false;
#endif
}
Modified: branches/safari-610.1.11-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-04-25 00:52:38 UTC (rev 260688)
@@ -741,7 +741,7 @@
void WebPageProxy::applicationDidBecomeActive()
{
-#if HAVE(AVKIT)
+#if ENABLE(VIDEO_PRESENTATION_MODE)
if (m_videoFullscreenManager)
m_videoFullscreenManager->applicationDidBecomeActive();
#endif
Modified: branches/safari-610.1.11-branch/Source/WebKitLegacy/mac/ChangeLog (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/WebKitLegacy/mac/ChangeLog 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/WebKitLegacy/mac/ChangeLog 2020-04-25 00:52:38 UTC (rev 260688)
@@ -1,5 +1,62 @@
2020-04-24 Alan Coon <[email protected]>
+ Cherry-pick r260486. rdar://problem/62349885
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebCore:
+
+ No new tests, no functional change.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ * UIProcess/API/ios/WKWebViewIOS.mm:
+ (-[WKWebView _isShowingVideoPictureInPicture]):
+ (-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationDidBecomeActive):
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WTF:
+
+ * wtf/PlatformEnable.h:
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-21 Peng Liu <[email protected]>
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
+2020-04-24 Alan Coon <[email protected]>
+
Cherry-pick r260412. rdar://problem/62349885
Fix build failures when video fullscreen and picture-in-picture is disabled
Modified: branches/safari-610.1.11-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (260687 => 260688)
--- branches/safari-610.1.11-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2020-04-25 00:52:38 UTC (rev 260688)
@@ -376,6 +376,7 @@
ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
Modified: branches/safari-610.1.11-branch/Tools/ChangeLog (260687 => 260688)
--- branches/safari-610.1.11-branch/Tools/ChangeLog 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Tools/ChangeLog 2020-04-25 00:52:38 UTC (rev 260688)
@@ -1,5 +1,62 @@
2020-04-24 Alan Coon <[email protected]>
+ Cherry-pick r260486. rdar://problem/62349885
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ Source/_javascript_Core:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebCore:
+
+ No new tests, no functional change.
+
+ * Configurations/FeatureDefines.xcconfig:
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+
+ Source/WebCore/PAL:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WebKit:
+
+ * Configurations/FeatureDefines.xcconfig:
+ * UIProcess/API/ios/WKWebViewIOS.mm:
+ (-[WKWebView _isShowingVideoPictureInPicture]):
+ (-[WKWebView _mayAutomaticallyShowVideoPictureInPicture]):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::applicationDidBecomeActive):
+
+ Source/WebKitLegacy/mac:
+
+ * Configurations/FeatureDefines.xcconfig:
+
+ Source/WTF:
+
+ * wtf/PlatformEnable.h:
+
+ Tools:
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@260486 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-21 Peng Liu <[email protected]>
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
+2020-04-24 Alan Coon <[email protected]>
+
Cherry-pick r260412. rdar://problem/62349885
Fix build failures when video fullscreen and picture-in-picture is disabled
Modified: branches/safari-610.1.11-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (260687 => 260688)
--- branches/safari-610.1.11-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2020-04-25 00:52:33 UTC (rev 260687)
+++ branches/safari-610.1.11-branch/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2020-04-25 00:52:38 UTC (rev 260688)
@@ -376,6 +376,7 @@
ENABLE_VIDEO_PRESENTATION_MODE_iphoneos = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_PRESENTATION_MODE_watchos = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_PRESENTATION_MODE_macosx = ENABLE_VIDEO_PRESENTATION_MODE;
+ENABLE_VIDEO_PRESENTATION_MODE_maccatalyst = ENABLE_VIDEO_PRESENTATION_MODE;
ENABLE_VIDEO_TRACK = ENABLE_VIDEO_TRACK;
