Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (260485 => 260486)
--- trunk/Source/_javascript_Core/ChangeLog 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-04-22 01:54:13 UTC (rev 260486)
@@ -1,3 +1,12 @@
+2020-04-21 Peng Liu <peng.l...@apple.com>
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2020-04-21 Keith Miller <keith_mil...@apple.com>
JSC's options should be case insensitive
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (260485 => 260486)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2020-04-22 01:54:13 UTC (rev 260486)
@@ -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: trunk/Source/WTF/ChangeLog (260485 => 260486)
--- trunk/Source/WTF/ChangeLog 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/WTF/ChangeLog 2020-04-22 01:54:13 UTC (rev 260486)
@@ -1,3 +1,12 @@
+2020-04-21 Peng Liu <peng.l...@apple.com>
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ * wtf/PlatformEnable.h:
+
2020-04-19 Darin Adler <da...@apple.com>
[Cocoa] Use createNSArray in many more places that build NSArray objects from C++ collections
Modified: trunk/Source/WTF/wtf/PlatformEnable.h (260485 => 260486)
--- trunk/Source/WTF/wtf/PlatformEnable.h 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/WTF/wtf/PlatformEnable.h 2020-04-22 01:54:13 UTC (rev 260486)
@@ -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: trunk/Source/WebCore/ChangeLog (260485 => 260486)
--- trunk/Source/WebCore/ChangeLog 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/WebCore/ChangeLog 2020-04-22 01:54:13 UTC (rev 260486)
@@ -1,3 +1,15 @@
+2020-04-21 Peng Liu <peng.l...@apple.com>
+
+ 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-19 Darin Adler <da...@apple.com>
[Cocoa] Use createNSArray in many more places that build NSArray objects from C++ collections
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (260485 => 260486)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2020-04-22 01:54:13 UTC (rev 260486)
@@ -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: trunk/Source/WebCore/PAL/ChangeLog (260485 => 260486)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-04-22 01:54:13 UTC (rev 260486)
@@ -1,3 +1,12 @@
+2020-04-21 Peng Liu <peng.l...@apple.com>
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2020-04-20 Peng Liu <peng.l...@apple.com>
Fix build failures when video fullscreen and picture-in-picture is disabled
Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (260485 => 260486)
--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2020-04-22 01:54:13 UTC (rev 260486)
@@ -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: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (260485 => 260486)
--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2020-04-22 01:54:13 UTC (rev 260486)
@@ -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: trunk/Source/WebKit/ChangeLog (260485 => 260486)
--- trunk/Source/WebKit/ChangeLog 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/WebKit/ChangeLog 2020-04-22 01:54:13 UTC (rev 260486)
@@ -1,3 +1,17 @@
+2020-04-21 Peng Liu <peng.l...@apple.com>
+
+ 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-19 Darin Adler <da...@apple.com>
[Cocoa] Use createNSArray in many more places that build NSArray objects from C++ collections
Modified: trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig (260485 => 260486)
--- trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2020-04-22 01:54:13 UTC (rev 260486)
@@ -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: trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (260485 => 260486)
--- trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2020-04-22 01:54:13 UTC (rev 260486)
@@ -177,25 +177,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: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (260485 => 260486)
--- trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-04-22 01:54:13 UTC (rev 260486)
@@ -741,7 +741,7 @@
void WebPageProxy::applicationDidBecomeActive()
{
-#if HAVE(AVKIT)
+#if ENABLE(VIDEO_PRESENTATION_MODE)
if (m_videoFullscreenManager)
m_videoFullscreenManager->applicationDidBecomeActive();
#endif
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (260485 => 260486)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-04-22 01:54:13 UTC (rev 260486)
@@ -1,3 +1,12 @@
+2020-04-21 Peng Liu <peng.l...@apple.com>
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ * Configurations/FeatureDefines.xcconfig:
+
2020-04-19 Darin Adler <da...@apple.com>
[Cocoa] Use createNSArray in many more places that build NSArray objects from C++ collections
Modified: trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (260485 => 260486)
--- trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2020-04-22 01:54:13 UTC (rev 260486)
@@ -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: trunk/Tools/ChangeLog (260485 => 260486)
--- trunk/Tools/ChangeLog 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Tools/ChangeLog 2020-04-22 01:54:13 UTC (rev 260486)
@@ -1,3 +1,12 @@
+2020-04-21 Peng Liu <peng.l...@apple.com>
+
+ Fix MACCATALYST build failures
+ https://bugs.webkit.org/show_bug.cgi?id=210815
+
+ Reviewed by Tim Horton.
+
+ * TestWebKitAPI/Configurations/FeatureDefines.xcconfig:
+
2020-04-19 Darin Adler <da...@apple.com>
[Cocoa] Use createNSArray in many more places that build NSArray objects from C++ collections
Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (260485 => 260486)
--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2020-04-22 01:50:54 UTC (rev 260485)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2020-04-22 01:54:13 UTC (rev 260486)
@@ -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;
