Title: [230177] trunk/Source/WebCore
Revision
230177
Author
[email protected]
Date
2018-04-02 13:34:08 -0700 (Mon, 02 Apr 2018)

Log Message

Define AVKit softlink macro
https://bugs.webkit.org/show_bug.cgi?id=184241

Reviewed by Jer Noble.

Source/WebCore:

No new tests, no functional change.

* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
* platform/ios/PlaybackSessionInterfaceAVKit.mm:
* platform/ios/VideoFullscreenInterfaceAVKit.mm:
* platform/ios/WebAVPlayerController.mm:
* platform/mac/PlaybackSessionInterfaceMac.mm:
* platform/mac/VideoFullscreenInterfaceMac.mm:

Source/WebCore/PAL:

* pal/cf/CoreMediaSoftLink.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (230176 => 230177)


--- trunk/Source/WebCore/ChangeLog	2018-04-02 20:27:56 UTC (rev 230176)
+++ trunk/Source/WebCore/ChangeLog	2018-04-02 20:34:08 UTC (rev 230177)
@@ -1,3 +1,19 @@
+2018-04-02  Eric Carlson  <[email protected]>
+
+        Define AVKit softlink macro
+        https://bugs.webkit.org/show_bug.cgi?id=184241
+
+        Reviewed by Jer Noble.
+
+        No new tests, no functional change.
+
+        * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm:
+        * platform/ios/PlaybackSessionInterfaceAVKit.mm:
+        * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+        * platform/ios/WebAVPlayerController.mm:
+        * platform/mac/PlaybackSessionInterfaceMac.mm:
+        * platform/mac/VideoFullscreenInterfaceMac.mm:
+
 2018-04-02  Wenson Hsieh  <[email protected]>
 
         [Extra zoom mode] Update date picker UI to latest specifications

Modified: trunk/Source/WebCore/PAL/ChangeLog (230176 => 230177)


--- trunk/Source/WebCore/PAL/ChangeLog	2018-04-02 20:27:56 UTC (rev 230176)
+++ trunk/Source/WebCore/PAL/ChangeLog	2018-04-02 20:34:08 UTC (rev 230177)
@@ -1,3 +1,12 @@
+2018-04-02  Eric Carlson  <[email protected]>
+
+        Define AVKit softlink macro
+        https://bugs.webkit.org/show_bug.cgi?id=184241
+
+        Reviewed by Jer Noble.
+
+        * pal/cf/CoreMediaSoftLink.h:
+
 2018-03-23  Tim Horton  <[email protected]>
 
         Fix the !HAVE(APP_LINKS) build

Modified: trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h (230176 => 230177)


--- trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h	2018-04-02 20:27:56 UTC (rev 230176)
+++ trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h	2018-04-02 20:34:08 UTC (rev 230177)
@@ -31,6 +31,12 @@
 #include <pal/spi/cf/CoreMediaSPI.h>
 #include <wtf/SoftLinking.h>
 
+#if ENABLE(EXTRA_ZOOM_MODE)
+#define SOFTLINK_AVKIT_FRAMEWORK() SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(AVKit)
+#else
+#define SOFTLINK_AVKIT_FRAMEWORK() SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
+#endif
+
 SOFT_LINK_FRAMEWORK_FOR_HEADER(PAL, CoreMedia)
 
 SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMBlockBufferCopyDataBytes, OSStatus, (CMBlockBufferRef theSourceBuffer, size_t offsetToData, size_t dataLength, void* destination), (theSourceBuffer, offsetToData, dataLength, destination))

Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm (230176 => 230177)


--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm	2018-04-02 20:27:56 UTC (rev 230176)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm	2018-04-02 20:34:08 UTC (rev 230177)
@@ -32,16 +32,16 @@
 #import <WebCore/FloatRect.h>
 #import <WebCore/MediaPlaybackTargetMac.h>
 #import <objc/runtime.h>
+#import <pal/cf/CoreMediaSoftLink.h>
 #import <pal/spi/cocoa/AVKitSPI.h>
 #import <pal/spi/mac/AVFoundationSPI.h>
 #import <wtf/MainThread.h>
-#import <wtf/SoftLinking.h>
 
 typedef AVOutputContext AVOutputContextType;
 typedef AVOutputDeviceMenuController AVOutputDeviceMenuControllerType;
 
+SOFTLINK_AVKIT_FRAMEWORK()
 SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
-SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
 
 SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVOutputContext)
 SOFT_LINK_CLASS_OPTIONAL(AVKit, AVOutputDeviceMenuController)

Modified: trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm (230176 => 230177)


--- trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm	2018-04-02 20:27:56 UTC (rev 230176)
+++ trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm	2018-04-02 20:34:08 UTC (rev 230177)
@@ -43,7 +43,7 @@
 
 #import <pal/cf/CoreMediaSoftLink.h>
 
-SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
+SOFTLINK_AVKIT_FRAMEWORK()
 SOFT_LINK_CLASS_OPTIONAL(AVKit, AVValueTiming)
 
 namespace WebCore {

Modified: trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm (230176 => 230177)


--- trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm	2018-04-02 20:27:56 UTC (rev 230176)
+++ trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm	2018-04-02 20:34:08 UTC (rev 230177)
@@ -60,7 +60,7 @@
 SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResizeAspect, NSString *)
 SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResizeAspectFill, NSString *)
 
-SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
+SOFTLINK_AVKIT_FRAMEWORK()
 SOFT_LINK_CLASS_OPTIONAL(AVKit, AVPictureInPictureController)
 SOFT_LINK_CLASS_OPTIONAL(AVKit, AVPlayerViewController)
 SOFT_LINK_CLASS_OPTIONAL(AVKit, __AVPlayerLayerView)

Modified: trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm (230176 => 230177)


--- trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm	2018-04-02 20:27:56 UTC (rev 230176)
+++ trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm	2018-04-02 20:34:08 UTC (rev 230177)
@@ -40,7 +40,7 @@
 
 #import <pal/cf/CoreMediaSoftLink.h>
 
-SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
+SOFTLINK_AVKIT_FRAMEWORK()
 SOFT_LINK_CLASS_OPTIONAL(AVKit, AVPlayerController)
 SOFT_LINK_CLASS_OPTIONAL(AVKit, AVValueTiming)
 

Modified: trunk/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.mm (230176 => 230177)


--- trunk/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.mm	2018-04-02 20:27:56 UTC (rev 230176)
+++ trunk/Source/WebCore/platform/mac/PlaybackSessionInterfaceMac.mm	2018-04-02 20:34:08 UTC (rev 230177)
@@ -39,7 +39,7 @@
 
 #import <pal/cf/CoreMediaSoftLink.h>
 
-SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
+SOFTLINK_AVKIT_FRAMEWORK()
 SOFT_LINK_CLASS_OPTIONAL(AVKit, AVValueTiming)
 
 namespace WebCore {

Modified: trunk/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm (230176 => 230177)


--- trunk/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm	2018-04-02 20:27:56 UTC (rev 230176)
+++ trunk/Source/WebCore/platform/mac/VideoFullscreenInterfaceMac.mm	2018-04-02 20:34:08 UTC (rev 230177)
@@ -42,7 +42,7 @@
 
 #import <pal/cf/CoreMediaSoftLink.h>
 
-SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
+SOFTLINK_AVKIT_FRAMEWORK()
 SOFT_LINK_CLASS_OPTIONAL(AVKit, AVValueTiming)
 
 SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(PIP)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to