Title: [229184] trunk/Source
- Revision
- 229184
- Author
- timothy_hor...@apple.com
- Date
- 2018-03-02 11:47:17 -0800 (Fri, 02 Mar 2018)
Log Message
Make it possible to build for iOS without Celestial
https://bugs.webkit.org/show_bug.cgi?id=183295
<rdar://problem/38074468>
Reviewed by Dan Bernstein.
Source/WebCore:
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::exernalDeviceDisplayNameForPlayer):
Source/WTF:
* wtf/Platform.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (229183 => 229184)
--- trunk/Source/WTF/ChangeLog 2018-03-02 19:17:02 UTC (rev 229183)
+++ trunk/Source/WTF/ChangeLog 2018-03-02 19:47:17 UTC (rev 229184)
@@ -1,5 +1,15 @@
2018-03-02 Tim Horton <timothy_hor...@apple.com>
+ Make it possible to build for iOS without Celestial
+ https://bugs.webkit.org/show_bug.cgi?id=183295
+ <rdar://problem/38074468>
+
+ Reviewed by Dan Bernstein.
+
+ * wtf/Platform.h:
+
+2018-03-02 Tim Horton <timothy_hor...@apple.com>
+
Make it possible to disable WKPDFView
https://bugs.webkit.org/show_bug.cgi?id=183281
<rdar://problem/38060815>
Modified: trunk/Source/WTF/wtf/Platform.h (229183 => 229184)
--- trunk/Source/WTF/wtf/Platform.h 2018-03-02 19:17:02 UTC (rev 229183)
+++ trunk/Source/WTF/wtf/Platform.h 2018-03-02 19:47:17 UTC (rev 229184)
@@ -590,6 +590,7 @@
#if PLATFORM(IOS)
+#define HAVE_CELESTIAL 1
#define HAVE_NETWORK_EXTENSION 1
#define HAVE_READLINE 1
#define USE_UIKIT_EDITING 1
Modified: trunk/Source/WebCore/ChangeLog (229183 => 229184)
--- trunk/Source/WebCore/ChangeLog 2018-03-02 19:17:02 UTC (rev 229183)
+++ trunk/Source/WebCore/ChangeLog 2018-03-02 19:47:17 UTC (rev 229184)
@@ -1,3 +1,14 @@
+2018-03-02 Tim Horton <timothy_hor...@apple.com>
+
+ Make it possible to build for iOS without Celestial
+ https://bugs.webkit.org/show_bug.cgi?id=183295
+ <rdar://problem/38074468>
+
+ Reviewed by Dan Bernstein.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::exernalDeviceDisplayNameForPlayer):
+
2018-03-02 Youenn Fablet <you...@apple.com>
Clients should register to StorageProcess with their service worker registration identifier
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (229183 => 229184)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-03-02 19:17:02 UTC (rev 229183)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2018-03-02 19:47:17 UTC (rev 229184)
@@ -293,6 +293,7 @@
SOFT_LINK_OPTIONAL(MediaToolbox, MTEnableCaption2015Behavior, Boolean, (), ())
#if PLATFORM(IOS)
+#if HAVE(CELESTIAL)
SOFT_LINK_PRIVATE_FRAMEWORK(Celestial)
SOFT_LINK_POINTER(Celestial, AVController_RouteDescriptionKey_RouteCurrentlyPicked, NSString *)
SOFT_LINK_POINTER(Celestial, AVController_RouteDescriptionKey_RouteName, NSString *)
@@ -300,11 +301,12 @@
#define AVController_RouteDescriptionKey_RouteCurrentlyPicked getAVController_RouteDescriptionKey_RouteCurrentlyPicked()
#define AVController_RouteDescriptionKey_RouteName getAVController_RouteDescriptionKey_RouteName()
#define AVController_RouteDescriptionKey_AVAudioRouteName getAVController_RouteDescriptionKey_AVAudioRouteName()
+#endif // HAVE(CELESTIAL)
SOFT_LINK_FRAMEWORK(UIKit)
SOFT_LINK_CLASS(UIKit, UIDevice)
#define UIDevice getUIDeviceClass()
-#endif
+#endif // PLATFORM(IOS)
using namespace WebCore;
@@ -2835,6 +2837,7 @@
#if PLATFORM(IOS)
static NSString *exernalDeviceDisplayNameForPlayer(AVPlayerType *player)
{
+#if HAVE(CELESTIAL)
NSString *displayName = nil;
if (!AVFoundationLibrary())
@@ -2881,6 +2884,9 @@
}
return displayName;
+#else
+ return nil;
+#endif
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
