Title: [257409] trunk/Source/WebCore
- Revision
- 257409
- Author
- jer.no...@apple.com
- Date
- 2020-02-25 21:51:00 -0800 (Tue, 25 Feb 2020)
Log Message
Unreviewed tvOS build fix; fix the compiler guards broken by r257189.
* platform/ios/PlaybackSessionInterfaceAVKit.h:
* platform/ios/PlaybackSessionInterfaceAVKit.mm:
* platform/ios/WebAVPlayerController.h:
* platform/ios/WebAVPlayerController.mm:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (257408 => 257409)
--- trunk/Source/WebCore/ChangeLog 2020-02-26 05:26:02 UTC (rev 257408)
+++ trunk/Source/WebCore/ChangeLog 2020-02-26 05:51:00 UTC (rev 257409)
@@ -1,3 +1,12 @@
+2020-02-25 Jer Noble <jer.no...@apple.com>
+
+ Unreviewed tvOS build fix; fix the compiler guards broken by r257189.
+
+ * platform/ios/PlaybackSessionInterfaceAVKit.h:
+ * platform/ios/PlaybackSessionInterfaceAVKit.mm:
+ * platform/ios/WebAVPlayerController.h:
+ * platform/ios/WebAVPlayerController.mm:
+
2020-02-25 Jack Lee <shihchieh_...@apple.com>
ASSERTION FAILURE in AppendNodeCommand::AppendNodeCommand when inserting list with read-only user-modify
Modified: trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.h (257408 => 257409)
--- trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.h 2020-02-26 05:26:02 UTC (rev 257408)
+++ trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.h 2020-02-26 05:51:00 UTC (rev 257409)
@@ -26,7 +26,7 @@
#pragma once
-#if HAVE(AVKIT)
+#if PLATFORM(COCOA)
#include "EventListener.h"
#include "HTMLMediaElementEnums.h"
@@ -88,4 +88,4 @@
}
-#endif // HAVE(AVKIT)
+#endif // PLATFORM(COCOA)
Modified: trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm (257408 => 257409)
--- trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm 2020-02-26 05:26:02 UTC (rev 257408)
+++ trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm 2020-02-26 05:51:00 UTC (rev 257409)
@@ -27,6 +27,7 @@
#import "config.h"
#import "PlaybackSessionInterfaceAVKit.h"
+#if PLATFORM(COCOA)
#if HAVE(AVKIT)
#import "Logging.h"
@@ -230,3 +231,4 @@
}
#endif // HAVE(AVKIT)
+#endif // PLATFORM(COCOA)
Modified: trunk/Source/WebCore/platform/ios/WebAVPlayerController.h (257408 => 257409)
--- trunk/Source/WebCore/platform/ios/WebAVPlayerController.h 2020-02-26 05:26:02 UTC (rev 257408)
+++ trunk/Source/WebCore/platform/ios/WebAVPlayerController.h 2020-02-26 05:51:00 UTC (rev 257409)
@@ -23,7 +23,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if HAVE(AVKIT)
+#if PLATFORM(COCOA) && HAVE(AVKIT)
#import <pal/spi/cocoa/AVKitSPI.h>
Modified: trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm (257408 => 257409)
--- trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm 2020-02-26 05:26:02 UTC (rev 257408)
+++ trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm 2020-02-26 05:51:00 UTC (rev 257409)
@@ -27,7 +27,7 @@
#import "config.h"
#import "WebAVPlayerController.h"
-#if HAVE(AVKIT)
+#if PLATFORM(COCOA) && HAVE(AVKIT)
#import "Logging.h"
#import "PlaybackSessionInterfaceAVKit.h"
@@ -660,5 +660,5 @@
@end
-#endif // HAVE(AVKIT)
+#endif // PLATFORM(COCOA) && HAVE(AVKIT)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
