Title: [260293] trunk/Source/WebCore
- Revision
- 260293
- Author
- peng.l...@apple.com
- Date
- 2020-04-17 15:41:03 -0700 (Fri, 17 Apr 2020)
Log Message
Cleanup the macros for video fullscreen and picture-in-picture
https://bugs.webkit.org/show_bug.cgi?id=210638
Reviewed by Eric Carlson.
A follow-up patch to fix build failures of r260259.
* platform/ios/VideoFullscreenInterfaceAVKit.h:
* platform/ios/VideoFullscreenInterfaceAVKit.mm:
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (260292 => 260293)
--- trunk/Source/WebCore/ChangeLog 2020-04-17 22:35:26 UTC (rev 260292)
+++ trunk/Source/WebCore/ChangeLog 2020-04-17 22:41:03 UTC (rev 260293)
@@ -1,3 +1,16 @@
+2020-04-17 Peng Liu <peng.l...@apple.com>
+
+ Cleanup the macros for video fullscreen and picture-in-picture
+ https://bugs.webkit.org/show_bug.cgi?id=210638
+
+ Reviewed by Eric Carlson.
+
+ A follow-up patch to fix build failures of r260259.
+
+ * platform/ios/VideoFullscreenInterfaceAVKit.h:
+ * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+ * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+
2020-04-17 David Kilzer <ddkil...@apple.com>
REGRESSION (r234105): [iOS] WKColorButton leaks a UIColor
Modified: trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.h (260292 => 260293)
--- trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.h 2020-04-17 22:35:26 UTC (rev 260292)
+++ trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.h 2020-04-17 22:41:03 UTC (rev 260293)
@@ -26,7 +26,7 @@
#pragma once
-#if PLATFORM(IOS_FAMILY)
+#if PLATFORM(IOS_FAMILY) && ENABLE(VIDEO_PRESENTATION_MODE)
#include "EventListener.h"
#include "HTMLMediaElementEnums.h"
Modified: trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm (260292 => 260293)
--- trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2020-04-17 22:35:26 UTC (rev 260292)
+++ trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm 2020-04-17 22:41:03 UTC (rev 260293)
@@ -26,14 +26,11 @@
#import "config.h"
#import "VideoFullscreenInterfaceAVKit.h"
-#if PLATFORM(IOS_FAMILY)
+#if PLATFORM(IOS_FAMILY) && ENABLE(VIDEO_PRESENTATION_MODE)
-#import "PictureInPictureSupport.h"
-
-#if HAVE(AVKIT)
-
#import "GeometryUtilities.h"
#import "Logging.h"
+#import "PictureInPictureSupport.h"
#import "PlaybackSessionInterfaceAVKit.h"
#import "RuntimeApplicationChecks.h"
#import "TimeRanges.h"
@@ -1551,8 +1548,6 @@
return hasMode(WebCore::HTMLMediaElementEnums::VideoFullscreenModePictureInPicture) && [playerController() isPlaying];
}
-#endif // HAVE(AVKIT)
-
static Optional<bool> isPictureInPictureSupported;
void WebCore::setSupportsPictureInPicture(bool isSupported)
@@ -1571,4 +1566,4 @@
#endif
}
-#endif // PLATFORM(IOS_FAMILY)
+#endif // PLATFORM(IOS_FAMILY) && ENABLE(VIDEO_PRESENTATION_MODE)
Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (260292 => 260293)
--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2020-04-17 22:35:26 UTC (rev 260292)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm 2020-04-17 22:41:03 UTC (rev 260293)
@@ -24,11 +24,10 @@
*/
#import "config.h"
+#import "WebVideoFullscreenControllerAVKit.h"
#if PLATFORM(IOS_FAMILY)
-#import "WebVideoFullscreenControllerAVKit.h"
-
#import "Logging.h"
#import "MediaSelectionOption.h"
#import "PlaybackSessionInterfaceAVKit.h"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes