[webkit-changes] [199701] trunk/Source/WebCore

Mon, 18 Apr 2016 18:53:11 -0700

Title: [199701] trunk/Source/WebCore
Revision
199701
Author
[email protected]
Date
2016-04-18 18:52:24 -0700 (Mon, 18 Apr 2016)

Log Message

[OSX] AVKit is not available on all systems
https://bugs.webkit.org/show_bug.cgi?id=156724
<rdar://problem/25501587>

Reviewed by Dean Jackson.

* platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm: Add _OPTIONAL to all
  AVKit softlink macros.
* platform/ios/WebAVPlayerController.mm: Ditto.
* platform/ios/WebPlaybackSessionInterfaceAVKit.mm: Ditto.
* platform/ios/WebVideoFullscreenInterfaceAVKit.mm: Ditto.
* platform/mac/WebPlaybackSessionInterfaceMac.mm: Ditto.
* platform/mac/WebVideoFullscreenInterfaceMac.mm: Ditto.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (199700 => 199701)


--- trunk/Source/WebCore/ChangeLog	2016-04-19 01:46:48 UTC (rev 199700)
+++ trunk/Source/WebCore/ChangeLog	2016-04-19 01:52:24 UTC (rev 199701)
@@ -1,3 +1,19 @@
+2016-04-18  Eric Carlson  <[email protected]>
+
+        [OSX] AVKit is not available on all systems
+        https://bugs.webkit.org/show_bug.cgi?id=156724
+        <rdar://problem/25501587>
+
+        Reviewed by Dean Jackson.
+
+        * platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm: Add _OPTIONAL to all
+          AVKit softlink macros.
+        * platform/ios/WebAVPlayerController.mm: Ditto.
+        * platform/ios/WebPlaybackSessionInterfaceAVKit.mm: Ditto.
+        * platform/ios/WebVideoFullscreenInterfaceAVKit.mm: Ditto.
+        * platform/mac/WebPlaybackSessionInterfaceMac.mm: Ditto.
+        * platform/mac/WebVideoFullscreenInterfaceMac.mm: Ditto.
+
 2016-04-18  Gavin Barraclough  <[email protected]>
 
         WebKit should adopt journal_mode=wal for all SQLite databases.

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


--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm	2016-04-19 01:46:48 UTC (rev 199700)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlaybackTargetPickerMac.mm	2016-04-19 01:52:24 UTC (rev 199701)
@@ -43,8 +43,8 @@
 SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
 SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
 
-SOFT_LINK_CLASS(AVFoundation, AVOutputContext)
-SOFT_LINK_CLASS(AVKit, AVOutputDeviceMenuController)
+SOFT_LINK_CLASS_OPTIONAL(AVFoundation, AVOutputContext)
+SOFT_LINK_CLASS_OPTIONAL(AVKit, AVOutputDeviceMenuController)
 
 using namespace WebCore;

Modified: trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm (199700 => 199701)


--- trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm	2016-04-19 01:46:48 UTC (rev 199700)
+++ trunk/Source/WebCore/platform/ios/WebAVPlayerController.mm	2016-04-19 01:52:24 UTC (rev 199701)
@@ -41,8 +41,8 @@
 
 #import "CoreMediaSoftLink.h"
 
-SOFT_LINK_FRAMEWORK(AVKit)
-SOFT_LINK_CLASS(AVKit, AVPlayerController)
+SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
+SOFT_LINK_CLASS_OPTIONAL(AVKit, AVPlayerController)
 
 using namespace WebCore;
 
@@ -50,6 +50,9 @@
 
 - (instancetype)init
 {
+    if (!getAVPlayerController())
+        return nil;
+
     if (!(self = [super init]))
         return self;

Modified: trunk/Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.mm (199700 => 199701)


--- trunk/Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.mm	2016-04-19 01:46:48 UTC (rev 199700)
+++ trunk/Source/WebCore/platform/ios/WebPlaybackSessionInterfaceAVKit.mm	2016-04-19 01:52:24 UTC (rev 199701)
@@ -42,8 +42,8 @@
 
 #import "CoreMediaSoftLink.h"
 
-SOFT_LINK_FRAMEWORK(AVKit)
-SOFT_LINK_CLASS(AVKit, AVValueTiming)
+SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
+SOFT_LINK_CLASS_OPTIONAL(AVKit, AVValueTiming)
 
 namespace WebCore {

Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm (199700 => 199701)


--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2016-04-19 01:46:48 UTC (rev 199700)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.mm	2016-04-19 01:52:24 UTC (rev 199701)
@@ -61,10 +61,10 @@
 SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResizeAspect, NSString *)
 SOFT_LINK_CONSTANT(AVFoundation, AVLayerVideoGravityResizeAspectFill, NSString *)
 
-SOFT_LINK_FRAMEWORK(AVKit)
-SOFT_LINK_CLASS(AVKit, AVPictureInPictureController)
-SOFT_LINK_CLASS(AVKit, AVPlayerViewController)
-SOFT_LINK_CLASS(AVKit, __AVPlayerLayerView)
+SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
+SOFT_LINK_CLASS_OPTIONAL(AVKit, AVPictureInPictureController)
+SOFT_LINK_CLASS_OPTIONAL(AVKit, AVPlayerViewController)
+SOFT_LINK_CLASS_OPTIONAL(AVKit, __AVPlayerLayerView)
 
 SOFT_LINK_FRAMEWORK(UIKit)
 SOFT_LINK_CLASS(UIKit, UIApplication)

Modified: trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm (199700 => 199701)


--- trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm	2016-04-19 01:46:48 UTC (rev 199700)
+++ trunk/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm	2016-04-19 01:52:24 UTC (rev 199701)
@@ -37,8 +37,8 @@
 
 #import "CoreMediaSoftLink.h"
 
-SOFT_LINK_FRAMEWORK(AVKit)
-SOFT_LINK_CLASS(AVKit, AVValueTiming)
+SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
+SOFT_LINK_CLASS_OPTIONAL(AVKit, AVValueTiming)
 
 using namespace WebCore;

Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm (199700 => 199701)


--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm	2016-04-19 01:46:48 UTC (rev 199700)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm	2016-04-19 01:52:24 UTC (rev 199701)
@@ -39,8 +39,8 @@
 
 #import "CoreMediaSoftLink.h"
 
-SOFT_LINK_FRAMEWORK(AVKit)
-SOFT_LINK_CLASS(AVKit, AVValueTiming)
+SOFT_LINK_FRAMEWORK_OPTIONAL(AVKit)
+SOFT_LINK_CLASS_OPTIONAL(AVKit, AVValueTiming)
 
 #if USE(APPLE_INTERNAL_SDK)
 #include <WebKitAdditions/WebVideoFullscreenInterfaceMacAdditions.mm>

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to