Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (258764 => 258765)
--- trunk/Source/_javascript_Core/ChangeLog 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-03-20 16:30:15 UTC (rev 258765)
@@ -1,3 +1,15 @@
+2020-03-20 Jacob Uphoff <[email protected]>
+
+ Unreviewed, reverting r258748.
+
+ This commit broke the Catalina build
+
+ Reverted changeset:
+
+ "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+ https://bugs.webkit.org/show_bug.cgi?id=209307
+ https://trac.webkit.org/changeset/258748
+
2020-03-19 Tim Horton <[email protected]>
Upstream a variety of Cocoa-platform HAVE and ENABLE macros
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (258764 => 258765)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2020-03-20 16:30:15 UTC (rev 258765)
@@ -263,7 +263,6 @@
ENABLE_MEDIA_SESSION = ;
ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
-ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
Modified: trunk/Source/WTF/ChangeLog (258764 => 258765)
--- trunk/Source/WTF/ChangeLog 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WTF/ChangeLog 2020-03-20 16:30:15 UTC (rev 258765)
@@ -1,3 +1,15 @@
+2020-03-20 Jacob Uphoff <[email protected]>
+
+ Unreviewed, reverting r258748.
+
+ This commit broke the Catalina build
+
+ Reverted changeset:
+
+ "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+ https://bugs.webkit.org/show_bug.cgi?id=209307
+ https://trac.webkit.org/changeset/258748
+
2020-03-19 Tim Horton <[email protected]>
Upstream a variety of Cocoa-platform HAVE and ENABLE macros
Modified: trunk/Source/WTF/wtf/PlatformEnableCocoa.h (258764 => 258765)
--- trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WTF/wtf/PlatformEnableCocoa.h 2020-03-20 16:30:15 UTC (rev 258765)
@@ -151,7 +151,7 @@
#define ENABLE_WKPDFVIEW 1
#endif
-#if !defined(ENABLE_MEDIA_SOURCE) && PLATFORM(MAC) || (PLATFORM(IOS) && !PLATFORM(IOS_FAMILY_SIMULATOR))
+#if !defined(ENABLE_MEDIA_SOURCE) && PLATFORM(MAC)
#define ENABLE_MEDIA_SOURCE 1
#endif
@@ -263,20 +263,3 @@
#if !defined(ENABLE_FTL_JIT) && !USE(JSVALUE32_64) && !PLATFORM(IOS_FAMILY_SIMULATOR)
#define ENABLE_FTL_JIT 1
#endif
-
-#if !defined(ENABLE_REVEAL) && ((PLATFORM(MACCATALYST) || PLATFORM(IOS)) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500))
-#define ENABLE_REVEAL 1
-#endif
-
-#if !defined (ENABLE_ANIMATED_KEYBOARD_SCROLLING) && PLATFORM(IOS_FAMILY)
-#define ENABLE_ANIMATED_KEYBOARD_SCROLLING 1
-#endif
-
-#if !defined(ENABLE_FULL_KEYBOARD_ACCESS) && PLATFORM(IOS)
-#define ENABLE_FULL_KEYBOARD_ACCESS 1
-#endif
-
-// FIXME: Should this be enabled for other iOS-family platforms?
-#if !defined(ENABLE_TAKE_UNBOUNDED_NETWORKING_ASSERTION) && (PLATFORM(IOS) || PLATFORM(MACCATALYST))
-#define ENABLE_TAKE_UNBOUNDED_NETWORKING_ASSERTION 1
-#endif
Modified: trunk/Source/WTF/wtf/PlatformHave.h (258764 => 258765)
--- trunk/Source/WTF/wtf/PlatformHave.h 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2020-03-20 16:30:15 UTC (rev 258765)
@@ -256,7 +256,7 @@
#define HAVE_FJCVTZS_INSTRUCTION 1
#endif
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
+#if PLATFORM(IOS)
#define HAVE_APP_LINKS 1
#endif
@@ -623,27 +623,6 @@
#define HAVE_SYSTEM_FEATURE_FLAGS 1
#endif
-#if PLATFORM(IOS)
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
#define HAVE_AVOBSERVATIONCONTROLLER 1
#endif
-
-#if PLATFORM(IOS_FAMILY)
-#define HAVE_MENU_CONTROLLER_SHOW_HIDE_API 1
-#endif
-
-// FIXME: Should this be enabled on other iOS-family platforms?
-#if PLATFORM(IOS) || PLATFORM(MACCATALYST)
-#define HAVE_CANCEL_WEB_TOUCH_EVENTS_GESTURE 1
-#endif
-
-#if PLATFORM(IOS_FAMILY)
-#define HAVE_UI_REMOTE_VIEW 1
-#endif
-
-#if PLATFORM(IOS_FAMILY)
-#define HAVE_PDF_HOST_VIEW_CONTROLLER_WITH_BACKGROUND_COLOR 1
-#endif
-
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130400
-#define HAVE_UISCENE_BASED_VIEW_SERVICE_STATE_NOTIFICATIONS 1
-#endif
Modified: trunk/Source/WebCore/ChangeLog (258764 => 258765)
--- trunk/Source/WebCore/ChangeLog 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebCore/ChangeLog 2020-03-20 16:30:15 UTC (rev 258765)
@@ -1,3 +1,15 @@
+2020-03-20 Jacob Uphoff <[email protected]>
+
+ Unreviewed, reverting r258748.
+
+ This commit broke the Catalina build
+
+ Reverted changeset:
+
+ "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+ https://bugs.webkit.org/show_bug.cgi?id=209307
+ https://trac.webkit.org/changeset/258748
+
2020-03-20 Zalan Bujtas <[email protected]>
[LFC][IFC] Avoid infinite loop when stuck on partial content
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (258764 => 258765)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2020-03-20 16:30:15 UTC (rev 258765)
@@ -263,7 +263,6 @@
ENABLE_MEDIA_SESSION = ;
ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
-ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
Modified: trunk/Source/WebCore/PAL/ChangeLog (258764 => 258765)
--- trunk/Source/WebCore/PAL/ChangeLog 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebCore/PAL/ChangeLog 2020-03-20 16:30:15 UTC (rev 258765)
@@ -1,3 +1,15 @@
+2020-03-20 Jacob Uphoff <[email protected]>
+
+ Unreviewed, reverting r258748.
+
+ This commit broke the Catalina build
+
+ Reverted changeset:
+
+ "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+ https://bugs.webkit.org/show_bug.cgi?id=209307
+ https://trac.webkit.org/changeset/258748
+
2020-03-20 Timothy Horton <[email protected]>
Fix the build
Modified: trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig (258764 => 258765)
--- trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebCore/PAL/Configurations/FeatureDefines.xcconfig 2020-03-20 16:30:15 UTC (rev 258765)
@@ -263,7 +263,6 @@
ENABLE_MEDIA_SESSION = ;
ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
-ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h (258764 => 258765)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h 2020-03-20 16:30:15 UTC (rev 258765)
@@ -124,7 +124,7 @@
#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(IOS_FAMILY_SIMULATOR)
-#if ENABLE(MEDIA_SOURCE)
+#if !PLATFORM(IOS_FAMILY)
#pragma mark -
#pragma mark AVStreamDataParser
@@ -163,7 +163,7 @@
@end
#endif
-#endif // ENABLE(MEDIA_SOURCE)
+#endif // !PLATFORM(IOS_FAMILY)
#endif // USE(APPLE_INTERNAL_SDK)
@@ -182,7 +182,7 @@
@end
#endif // HAVE(AVCONTENTKEYSESSION)
-#if ENABLE(MEDIA_SOURCE) && !USE(APPLE_INTERNAL_SDK)
+#if PLATFORM(MAC) && !USE(APPLE_INTERNAL_SDK)
NS_ASSUME_NONNULL_BEGIN
@interface AVStreamDataParser (AVStreamDataParserPrivate)
+ (NSString *)outputMIMECodecParameterForInputMIMECodecParameter:(NSString *)inputMIMECodecParameter;
Modified: trunk/Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h (258764 => 258765)
--- trunk/Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebCore/PAL/pal/spi/cocoa/RevealSPI.h 2020-03-20 16:30:15 UTC (rev 258765)
@@ -47,7 +47,6 @@
@interface RVItem : NSObject <NSSecureCoding>
- (instancetype)initWithText:(NSString *)text selectedRange:(NSRange)selectedRange NS_DESIGNATED_INITIALIZER;
-@property (readonly, nonatomic) NSRange highlightRange;
@end
@interface RVSelection : NSObject
@@ -59,6 +58,7 @@
- (instancetype)initWithPointerLocationInView:(NSPoint)pointerLocationInView inView:(NSView *)view highlightDelegate:(id<RVPresenterHighlightDelegate>)highlightDelegate;
@property (readonly, nonnull) NSArray <NSValue *> * itemRectsInView;
@end
+#endif
@protocol RVPresenterHighlightDelegate <NSObject>
@required
@@ -67,7 +67,6 @@
- (void)revealContext:(RVPresentingContext *)context stopHighlightingItem:(RVItem *)item;
- (void)revealContext:(RVPresentingContext *)context drawRectsForItem:(RVItem *)item;
@end
-#endif
@interface RVDocumentContext : NSObject < NSSecureCoding >
@end
@@ -75,8 +74,8 @@
@interface RVPresenter : NSObject
#if PLATFORM(MAC)
- (id<NSImmediateActionAnimationController>)animationControllerForItem:(RVItem *)item documentContext:(RVDocumentContext *)documentContext presentingContext:(RVPresentingContext *)presentingContext options:(NSDictionary *)options;
+#endif // PLATFORM(MAC)
- (BOOL)revealItem:(RVItem *)item documentContext:(RVDocumentContext *)documentContext presentingContext:(RVPresentingContext *)presentingContext options:(NSDictionary *)options;
-#endif // PLATFORM(MAC)
@end
#endif // !USE(APPLE_INTERNAL_SDK)
Modified: trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h (258764 => 258765)
--- trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebCore/PAL/pal/spi/ios/UIKitSPI.h 2020-03-20 16:30:15 UTC (rev 258765)
@@ -38,7 +38,6 @@
#import <UIKit/UIApplicationSceneConstants.h>
#import <UIKit/UIApplication_Private.h>
#import <UIKit/UIColor_Private.h>
-#import <UIKit/UIFocusRingStyle.h>
#import <UIKit/UIFont_Private.h>
#import <UIKit/UIInterface_Private.h>
#import <UIKit/UIScreen_Private.h>
@@ -56,6 +55,9 @@
- (CGFloat)_iOSMacScale;
@end
+#if __has_include(<UIKit/UIFocusRingStyle.h>)
+#import <UIKit/UIFocusRingStyle.h>
+#endif
#else // USE(APPLE_INTERNAL_SDK)
@@ -146,14 +148,6 @@
@property (nonatomic, copy, setter=_setTitle:) NSString *_title;
@end
-#if ENABLE(FULL_KEYBOARD_ACCESS)
-@interface UIFocusRingStyle : NSObject
-+ (CGFloat)cornerRadius;
-+ (CGFloat)maxAlpha;
-+ (CGFloat)alphaThreshold;
-@end
-#endif
-
#endif // USE(APPLE_INTERNAL_SDK)
#if ENABLE(FULL_KEYBOARD_ACCESS)
@@ -160,6 +154,12 @@
@interface UIColor (IPI)
+ (UIColor *)keyboardFocusIndicatorColor;
@end
+
+@interface UIFocusRingStyle (Staging_47831886)
++ (CGFloat)cornerRadius;
++ (CGFloat)maxAlpha;
++ (CGFloat)alphaThreshold;
+@end
#endif
#if HAVE(OS_DARK_MODE_SUPPORT)
Modified: trunk/Source/WebCore/page/cocoa/SettingsBaseCocoa.mm (258764 => 258765)
--- trunk/Source/WebCore/page/cocoa/SettingsBaseCocoa.mm 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebCore/page/cocoa/SettingsBaseCocoa.mm 2020-03-20 16:30:15 UTC (rev 258765)
@@ -86,15 +86,8 @@
return true;
}
-#if ENABLE(MEDIA_SOURCE)
-bool SettingsBase::platformDefaultMediaSourceEnabled()
-{
- return false;
-}
#endif
-#endif
-
const String& SettingsBase::defaultMediaContentTypesRequiringHardwareSupport()
{
return emptyString();
Modified: trunk/Source/WebKit/ChangeLog (258764 => 258765)
--- trunk/Source/WebKit/ChangeLog 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebKit/ChangeLog 2020-03-20 16:30:15 UTC (rev 258765)
@@ -1,3 +1,15 @@
+2020-03-20 Jacob Uphoff <[email protected]>
+
+ Unreviewed, reverting r258748.
+
+ This commit broke the Catalina build
+
+ Reverted changeset:
+
+ "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+ https://bugs.webkit.org/show_bug.cgi?id=209307
+ https://trac.webkit.org/changeset/258748
+
2020-03-19 David Kilzer <[email protected]>
SharedMemory::allocate() should initialize `address`
Modified: trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig (258764 => 258765)
--- trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebKit/Configurations/FeatureDefines.xcconfig 2020-03-20 16:30:15 UTC (rev 258765)
@@ -263,7 +263,6 @@
ENABLE_MEDIA_SESSION = ;
ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
-ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
Modified: trunk/Source/WebKit/Platform/spi/ios/PDFKitSPI.h (258764 => 258765)
--- trunk/Source/WebKit/Platform/spi/ios/PDFKitSPI.h 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebKit/Platform/spi/ios/PDFKitSPI.h 2020-03-20 16:30:15 UTC (rev 258765)
@@ -54,8 +54,6 @@
- (void) goToPageIndex:(NSInteger) pageIndex;
- (void) updatePDFViewLayout;
-+ (UIColor *)backgroundColor;
-
- (void) beginPDFViewRotation;
- (void) endPDFViewRotation;
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm (258764 => 258765)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeHostIOS.mm 2020-03-20 16:30:15 UTC (rev 258765)
@@ -43,7 +43,7 @@
static RetainPtr<UIView> createRemoteView(pid_t pid, uint32_t contextID)
{
-#if HAVE(UI_REMOTE_VIEW)
+#if USE(UIREMOTEVIEW_CONTEXT_HOSTING)
// FIXME: Remove this respondsToSelector check when possible.
static BOOL canUseUIRemoteView;
static std::once_flag initializeCanUseUIRemoteView;
Modified: trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm (258764 => 258765)
--- trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteLayerTreeViews.mm 2020-03-20 16:30:15 UTC (rev 258765)
@@ -271,7 +271,7 @@
@end
-#if HAVE(UI_REMOTE_VIEW)
+#if USE(UIREMOTEVIEW_CONTEXT_HOSTING)
@implementation WKUIRemoteView
- (instancetype)initWithFrame:(CGRect)frame pid:(pid_t)pid contextID:(uint32_t)contextID
Modified: trunk/Source/WebKit/UIProcess/ios/WKPDFView.mm (258764 => 258765)
--- trunk/Source/WebKit/UIProcess/ios/WKPDFView.mm 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebKit/UIProcess/ios/WKPDFView.mm 2020-03-20 16:30:15 UTC (rev 258765)
@@ -120,7 +120,7 @@
if (!(self = [super initWithFrame:frame webView:webView]))
return nil;
-#if HAVE(PDF_HOST_VIEW_CONTROLLER_WITH_BACKGROUND_COLOR)
+#if USE(PDFKIT_BACKGROUND_COLOR)
UIColor *backgroundColor = PDFHostViewController.backgroundColor;
#else
UIColor *backgroundColor = UIColor.grayColor;
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (258764 => 258765)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2020-03-20 16:30:15 UTC (rev 258765)
@@ -1,3 +1,15 @@
+2020-03-20 Jacob Uphoff <[email protected]>
+
+ Unreviewed, reverting r258748.
+
+ This commit broke the Catalina build
+
+ Reverted changeset:
+
+ "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+ https://bugs.webkit.org/show_bug.cgi?id=209307
+ https://trac.webkit.org/changeset/258748
+
2020-03-19 Tim Horton <[email protected]>
Upstream a variety of Cocoa-platform HAVE and ENABLE macros
Modified: trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig (258764 => 258765)
--- trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Source/WebKitLegacy/mac/Configurations/FeatureDefines.xcconfig 2020-03-20 16:30:15 UTC (rev 258765)
@@ -263,7 +263,6 @@
ENABLE_MEDIA_SESSION = ;
ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
-ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
Modified: trunk/Tools/ChangeLog (258764 => 258765)
--- trunk/Tools/ChangeLog 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Tools/ChangeLog 2020-03-20 16:30:15 UTC (rev 258765)
@@ -1,3 +1,15 @@
+2020-03-20 Jacob Uphoff <[email protected]>
+
+ Unreviewed, reverting r258748.
+
+ This commit broke the Catalina build
+
+ Reverted changeset:
+
+ "Upstream a variety of Cocoa-platform HAVE and ENABLE macros"
+ https://bugs.webkit.org/show_bug.cgi?id=209307
+ https://trac.webkit.org/changeset/258748
+
2020-03-20 Aakash Jain <[email protected]>
[ews] commit-queue should comment on bug if patch fails to apply
Modified: trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig (258764 => 258765)
--- trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2020-03-20 15:56:58 UTC (rev 258764)
+++ trunk/Tools/TestWebKitAPI/Configurations/FeatureDefines.xcconfig 2020-03-20 16:30:15 UTC (rev 258765)
@@ -263,7 +263,6 @@
ENABLE_MEDIA_SESSION = ;
ENABLE_MEDIA_SOURCE = $(ENABLE_MEDIA_SOURCE_$(WK_PLATFORM_NAME));
-ENABLE_MEDIA_SOURCE_iphoneos = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_SOURCE_macosx = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
