Diff
Modified: trunk/Source/WebCore/ChangeLog (222091 => 222092)
--- trunk/Source/WebCore/ChangeLog 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebCore/ChangeLog 2017-09-15 16:34:27 UTC (rev 222092)
@@ -1,3 +1,25 @@
+2017-09-15 Andy Estes <[email protected]>
+
+ [Cocoa] Upstream MediaRemote and VideoToolbox WebKitSystemInterface functions
+ https://bugs.webkit.org/show_bug.cgi?id=176953
+
+ Reviewed by Eric Carlson.
+
+ * platform/cocoa/VideoToolboxSoftLink.cpp:
+ * platform/cocoa/VideoToolboxSoftLink.h:
+ * platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm:
+ (WebCore::queryDecoderAvailability):
+ (WebCore::CDMPrivateMediaSourceAVFObjC::supportsKeySystem):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::wirelessPlaybackTargetType const):
+ (WebCore::exernalDeviceDisplayNameForPlayer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::wirelessPlaybackTargetName const):
+ * platform/ios/WebCoreSystemInterfaceIOS.mm:
+ * platform/mac/MediaRemoteSoftLink.cpp:
+ * platform/mac/MediaRemoteSoftLink.h:
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+
2017-09-15 Eric Carlson <[email protected]>
Switch text tracks to release logging
Modified: trunk/Source/WebCore/PAL/ChangeLog (222091 => 222092)
--- trunk/Source/WebCore/PAL/ChangeLog 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-09-15 16:34:27 UTC (rev 222092)
@@ -1,3 +1,13 @@
+2017-09-15 Andy Estes <[email protected]>
+
+ [Cocoa] Upstream MediaRemote and VideoToolbox WebKitSystemInterface functions
+ https://bugs.webkit.org/show_bug.cgi?id=176953
+
+ Reviewed by Eric Carlson.
+
+ * pal/spi/mac/AVFoundationSPI.h:
+ * pal/spi/mac/MediaRemoteSPI.h:
+
2017-09-15 Eric Carlson <[email protected]>
Switch text tracks to release logging
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h (222091 => 222092)
--- trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/AVFoundationSPI.h 2017-09-15 16:34:27 UTC (rev 222092)
@@ -100,6 +100,18 @@
#endif // PLATFORM(IOS) && !PLATFORM(IOS_SIMULATOR)
+#if PLATFORM(IOS)
+typedef NS_ENUM(NSInteger, AVPlayerExternalPlaybackType) {
+ AVPlayerExternalPlaybackTypeNone,
+ AVPlayerExternalPlaybackTypeAirPlay,
+ AVPlayerExternalPlaybackTypeTVOut,
+};
+
+@interface AVPlayer (AVPlayerExternalPlaybackSupportPrivate)
+@property (nonatomic, readonly) AVPlayerExternalPlaybackType externalPlaybackType;
+@end
+#endif
+
#if !PLATFORM(IOS)
#pragma mark -
Modified: trunk/Source/WebCore/PAL/pal/spi/mac/MediaRemoteSPI.h (222091 => 222092)
--- trunk/Source/WebCore/PAL/pal/spi/mac/MediaRemoteSPI.h 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebCore/PAL/pal/spi/mac/MediaRemoteSPI.h 2017-09-15 16:34:27 UTC (rev 222092)
@@ -131,6 +131,10 @@
void MRMediaRemoteSetNowPlayingApplicationPlaybackStateForOrigin(MROriginRef, MRPlaybackState, dispatch_queue_t replyQ, void(^completion)(MRMediaRemoteError));
void MRMediaRemoteSetNowPlayingInfo(CFDictionaryRef);
+#pragma mark - MRAVRouting
+
+CFArrayRef MRMediaRemoteCopyPickableRoutes();
+
WTF_EXTERN_C_END
#endif // USE(APPLE_INTERNAL_SDK)
Modified: trunk/Source/WebCore/platform/cocoa/VideoToolboxSoftLink.cpp (222091 => 222092)
--- trunk/Source/WebCore/platform/cocoa/VideoToolboxSoftLink.cpp 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebCore/platform/cocoa/VideoToolboxSoftLink.cpp 2017-09-15 16:34:27 UTC (rev 222092)
@@ -39,5 +39,6 @@
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, VideoToolbox, VTDecompressionSessionDecodeFrame, OSStatus, (VTDecompressionSessionRef session, CMSampleBufferRef sampleBuffer, VTDecodeFrameFlags decodeFlags, void* sourceFrameRefCon, VTDecodeInfoFlags* infoFlagsOut), (session, sampleBuffer, decodeFlags, sourceFrameRefCon, infoFlagsOut))
#define VTDecompressionSessionDecodeFrame softLink_VideoToolbox_VTDecompressionSessionDecodeFrame
SOFT_LINK_FUNCTION_MAY_FAIL_FOR_SOURCE(WebCore, VideoToolbox, VTIsHardwareDecodeSupported, Boolean, (CMVideoCodecType codecType), (codecType))
+SOFT_LINK_FUNCTION_MAY_FAIL_FOR_SOURCE(WebCore, VideoToolbox, VTGetGVADecoderAvailability, OSStatus, (uint32_t* totalInstanceCountOut, uint32_t* freeInstanceCountOut), (totalInstanceCountOut, freeInstanceCountOut))
SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, VideoToolbox, kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder, CFStringRef)
#define kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder get_VideoToolbox_kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder()
Modified: trunk/Source/WebCore/platform/cocoa/VideoToolboxSoftLink.h (222091 => 222092)
--- trunk/Source/WebCore/platform/cocoa/VideoToolboxSoftLink.h 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebCore/platform/cocoa/VideoToolboxSoftLink.h 2017-09-15 16:34:27 UTC (rev 222092)
@@ -40,5 +40,7 @@
#define VTDecompressionSessionDecodeFrame softLink_VideoToolbox_VTDecompressionSessionDecodeFrame
SOFT_LINK_FUNCTION_MAY_FAIL_FOR_HEADER(WebCore, VideoToolbox, VTIsHardwareDecodeSupported, Boolean, (CMVideoCodecType codecType), (codecType))
#define VTIsHardwareDecodeSupported softLink_VideoToolbox_VTIsHardwareDecodeSupported
+SOFT_LINK_FUNCTION_MAY_FAIL_FOR_HEADER(WebCore, VideoToolbox, VTGetGVADecoderAvailability, OSStatus, (uint32_t* totalInstanceCountOut, uint32_t* freeInstanceCountOut), (totalInstanceCountOut, freeInstanceCountOut))
+#define VTGetGVADecoderAvailability softLink_VideoToolbox_VTGetGVADecoderAvailability
SOFT_LINK_CONSTANT_FOR_HEADER(WebCore, VideoToolbox, kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder, CFStringRef)
#define kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder get_VideoToolbox_kVTVideoDecoderSpecification_EnableHardwareAcceleratedVideoDecoder()
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm (222091 => 222092)
--- trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/CDMPrivateMediaSourceAVFObjC.mm 2017-09-15 16:34:27 UTC (rev 222092)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -33,6 +33,7 @@
#import "ContentType.h"
#import "LegacyCDM.h"
#import "MediaPlayerPrivateMediaSourceAVFObjC.h"
+#import "VideoToolboxSoftLink.h"
#import "WebCoreSystemInterface.h"
#import <wtf/NeverDestroyed.h>
#import <wtf/text/StringView.h>
@@ -54,9 +55,18 @@
session->invalidateCDM();
}
+static bool queryDecoderAvailability()
+{
+ if (!canLoad_VideoToolbox_VTGetGVADecoderAvailability())
+ return false;
+ uint32_t totalInstanceCount = 0;
+ OSStatus status = VTGetGVADecoderAvailability(&totalInstanceCount, nullptr);
+ return status == noErr && totalInstanceCount;
+}
+
bool CDMPrivateMediaSourceAVFObjC::supportsKeySystem(const String& keySystem)
{
- if (!wkQueryDecoderAvailability())
+ if (!queryDecoderAvailability())
return false;
if (!keySystem.isEmpty() && validKeySystemRE().match(keySystem) < 0)
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (222091 => 222092)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2017-09-15 16:34:27 UTC (rev 222092)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011-2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2011-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -105,6 +105,7 @@
#if PLATFORM(IOS)
#import "WAKAppKitStubs.h"
#import <CoreImage/CoreImage.h>
+#import <UIKit/UIDevice.h>
#import <mach/mach_port.h>
#else
#import <Foundation/NSGeometry.h>
@@ -121,6 +122,7 @@
#endif
#import "CoreVideoSoftLink.h"
+#import "MediaRemoteSoftLink.h"
namespace std {
template <> struct iterator_traits<HashSet<RefPtr<WebCore::MediaSelectionOptionAVFObjC>>::iterator> {
@@ -293,6 +295,20 @@
SOFT_LINK_FRAMEWORK(MediaToolbox)
SOFT_LINK_OPTIONAL(MediaToolbox, MTEnableCaption2015Behavior, Boolean, (), ())
+#if PLATFORM(IOS)
+SOFT_LINK_PRIVATE_FRAMEWORK(Celestial)
+SOFT_LINK_POINTER(Celestial, AVController_RouteDescriptionKey_RouteCurrentlyPicked, NSString *)
+SOFT_LINK_POINTER(Celestial, AVController_RouteDescriptionKey_RouteName, NSString *)
+SOFT_LINK_POINTER(Celestial, AVController_RouteDescriptionKey_AVAudioRouteName, NSString *)
+#define AVController_RouteDescriptionKey_RouteCurrentlyPicked getAVController_RouteDescriptionKey_RouteCurrentlyPicked()
+#define AVController_RouteDescriptionKey_RouteName getAVController_RouteDescriptionKey_RouteName()
+#define AVController_RouteDescriptionKey_AVAudioRouteName getAVController_RouteDescriptionKey_AVAudioRouteName()
+
+SOFT_LINK_FRAMEWORK(UIKit)
+SOFT_LINK_CLASS(UIKit, UIDevice)
+#define UIDevice getUIDeviceClass()
+#endif
+
using namespace WebCore;
enum MediaPlayerAVFoundationObservationContext {
@@ -2849,12 +2865,15 @@
return MediaPlayer::TargetTypeNone;
#if PLATFORM(IOS)
- switch (wkExernalDeviceTypeForPlayer(m_avPlayer.get())) {
- case wkExternalPlaybackTypeNone:
+ if (!AVFoundationLibrary())
return MediaPlayer::TargetTypeNone;
- case wkExternalPlaybackTypeAirPlay:
+
+ switch ([m_avPlayer externalPlaybackType]) {
+ case AVPlayerExternalPlaybackTypeNone:
+ return MediaPlayer::TargetTypeNone;
+ case AVPlayerExternalPlaybackTypeAirPlay:
return MediaPlayer::TargetTypeAirPlay;
- case wkExternalPlaybackTypeTVOut:
+ case AVPlayerExternalPlaybackTypeTVOut:
return MediaPlayer::TargetTypeTVOut;
}
@@ -2865,7 +2884,59 @@
return MediaPlayer::TargetTypeAirPlay;
#endif
}
+
+#if PLATFORM(IOS)
+static NSString *exernalDeviceDisplayNameForPlayer(AVPlayerType *player)
+{
+ NSString *displayName = nil;
+ if (!AVFoundationLibrary())
+ return nil;
+
+ if (player.externalPlaybackType != AVPlayerExternalPlaybackTypeAirPlay)
+ return nil;
+
+ NSArray *pickableRoutes = CFBridgingRelease(MRMediaRemoteCopyPickableRoutes());
+ if (!pickableRoutes.count)
+ return nil;
+
+ for (NSDictionary *pickableRoute in pickableRoutes) {
+ if (![pickableRoute[AVController_RouteDescriptionKey_RouteCurrentlyPicked] boolValue])
+ continue;
+
+ displayName = pickableRoute[AVController_RouteDescriptionKey_RouteName];
+
+ NSString *routeName = pickableRoute[AVController_RouteDescriptionKey_AVAudioRouteName];
+ if (![routeName isEqualToString:@"Speaker"] && ![routeName isEqualToString:@"HDMIOutput"])
+ break;
+
+ // The route is a speaker or HDMI out, override the name to be the localized device model.
+ NSString *localizedDeviceModel = [[UIDevice currentDevice] localizedModel];
+
+ // In cases where a route with that name already exists, prefix the name with the model.
+ BOOL includeLocalizedDeviceModelName = NO;
+ for (NSDictionary *otherRoute in pickableRoutes) {
+ if (otherRoute == pickableRoute)
+ continue;
+
+ if ([otherRoute[AVController_RouteDescriptionKey_RouteName] rangeOfString:displayName].location != NSNotFound) {
+ includeLocalizedDeviceModelName = YES;
+ break;
+ }
+ }
+
+ if (includeLocalizedDeviceModelName)
+ displayName = [NSString stringWithFormat:@"%@ %@", localizedDeviceModel, displayName];
+ else
+ displayName = localizedDeviceModel;
+
+ break;
+ }
+
+ return displayName;
+}
+#endif
+
String MediaPlayerPrivateAVFoundationObjC::wirelessPlaybackTargetName() const
{
if (!m_avPlayer)
@@ -2876,7 +2947,7 @@
if (m_playbackTarget)
wirelessTargetName = m_playbackTarget->deviceName();
#else
- wirelessTargetName = wkExernalDeviceDisplayNameForPlayer(m_avPlayer.get());
+ wirelessTargetName = exernalDeviceDisplayNameForPlayer(m_avPlayer.get());
#endif
return wirelessTargetName;
Modified: trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm (222091 => 222092)
--- trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebCore/platform/ios/WebCoreSystemInterfaceIOS.mm 2017-09-15 16:34:27 UTC (rev 222092)
@@ -44,8 +44,3 @@
WEBCORE_EXPORT bool(*wkCaptionAppearanceGetRelativeCharacterSize)(CGFloat*);
WEBCORE_EXPORT int(*wkCaptionAppearanceGetTextEdgeStyle)(void);
WEBCORE_EXPORT CFStringRef(*wkCaptionAppearanceGetSettingsChangedNotification)(void);
-
-WEBCORE_EXPORT int (*wkExernalDeviceTypeForPlayer)(AVPlayer *);
-WEBCORE_EXPORT NSString *(*wkExernalDeviceDisplayNameForPlayer)(AVPlayer *);
-
-WEBCORE_EXPORT bool (*wkQueryDecoderAvailability)(void);
Modified: trunk/Source/WebCore/platform/mac/MediaRemoteSoftLink.cpp (222091 => 222092)
--- trunk/Source/WebCore/platform/mac/MediaRemoteSoftLink.cpp 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebCore/platform/mac/MediaRemoteSoftLink.cpp 2017-09-15 16:34:27 UTC (rev 222092)
@@ -25,12 +25,13 @@
#include "config.h"
-#if USE(MEDIAREMOTE)
-
#include <pal/spi/mac/MediaRemoteSPI.h>
#include <wtf/SoftLinking.h>
SOFT_LINK_PRIVATE_FRAMEWORK_FOR_SOURCE(WebCore, MediaRemote)
+
+#if USE(MEDIAREMOTE)
+
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, MediaRemote, MRMediaRemoteGetLocalOrigin, MROriginRef, (), ())
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, MediaRemote, MRMediaRemoteAddAsyncCommandHandlerBlock, void*, (MRMediaRemoteAsyncCommandHandlerBlock block), (block))
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, MediaRemote, MRMediaRemoteRemoveCommandHandlerBlock, void, (void* observer), (observer))
@@ -51,3 +52,7 @@
SOFT_LINK_CONSTANT_FOR_SOURCE(WebCore, MediaRemote, kMRMediaRemoteOptionPlaybackPosition, CFStringRef);
#endif // USE(MEDIAREMOTE)
+
+#if PLATFORM(IOS)
+SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, MediaRemote, MRMediaRemoteCopyPickableRoutes, CFArrayRef, (), ());
+#endif
Modified: trunk/Source/WebCore/platform/mac/MediaRemoteSoftLink.h (222091 => 222092)
--- trunk/Source/WebCore/platform/mac/MediaRemoteSoftLink.h 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebCore/platform/mac/MediaRemoteSoftLink.h 2017-09-15 16:34:27 UTC (rev 222092)
@@ -25,12 +25,13 @@
#pragma once
-#if USE(MEDIAREMOTE)
-
#include <pal/spi/mac/MediaRemoteSPI.h>
#include <wtf/SoftLinking.h>
SOFT_LINK_FRAMEWORK_FOR_HEADER(WebCore, MediaRemote)
+
+#if USE(MEDIAREMOTE)
+
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, MediaRemote, MRMediaRemoteGetLocalOrigin, MROriginRef, (), ())
#define MRMediaRemoteGetLocalOrigin softLink_MediaRemote_MRMediaRemoteGetLocalOrigin
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, MediaRemote, MRMediaRemoteAddAsyncCommandHandlerBlock, void*, (MRMediaRemoteAsyncCommandHandlerBlock block), (block))
@@ -69,3 +70,8 @@
#define kMRMediaRemoteOptionPlaybackPosition get_MediaRemote_kMRMediaRemoteOptionPlaybackPosition()
#endif // USE(MEDIAREMOTE)
+
+#if PLATFORM(IOS)
+SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, MediaRemote, MRMediaRemoteCopyPickableRoutes, CFArrayRef, (), ())
+#define MRMediaRemoteCopyPickableRoutes softLink_MediaRemote_MRMediaRemoteCopyPickableRoutes
+#endif
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (222091 => 222092)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2017-09-15 16:34:27 UTC (rev 222092)
@@ -156,14 +156,4 @@
extern CGFloat (*wkNSReboundDeltaForElasticDelta)(CGFloat delta);
#endif
-typedef enum {
- wkExternalPlaybackTypeNone,
- wkExternalPlaybackTypeAirPlay,
- wkExternalPlaybackTypeTVOut,
-} wkExternalPlaybackType;
-extern int (*wkExernalDeviceTypeForPlayer)(AVPlayer *);
-extern NSString *(*wkExernalDeviceDisplayNameForPlayer)(AVPlayer *);
-
-extern bool (*wkQueryDecoderAvailability)(void);
-
}
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (222091 => 222092)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2017-09-15 16:34:27 UTC (rev 222092)
@@ -53,8 +53,3 @@
CGFloat (*wkNSElasticDeltaForReboundDelta)(CGFloat delta);
CGFloat (*wkNSReboundDeltaForElasticDelta)(CGFloat delta);
#endif
-
-int (*wkExernalDeviceTypeForPlayer)(AVPlayer *);
-NSString *(*wkExernalDeviceDisplayNameForPlayer)(AVPlayer *);
-
-bool (*wkQueryDecoderAvailability)(void);
Modified: trunk/Source/WebKit/ChangeLog (222091 => 222092)
--- trunk/Source/WebKit/ChangeLog 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebKit/ChangeLog 2017-09-15 16:34:27 UTC (rev 222092)
@@ -1,3 +1,13 @@
+2017-09-15 Andy Estes <[email protected]>
+
+ [Cocoa] Upstream MediaRemote and VideoToolbox WebKitSystemInterface functions
+ https://bugs.webkit.org/show_bug.cgi?id=176953
+
+ Reviewed by Eric Carlson.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
2017-09-15 Ryosuke Niwa <[email protected]>
iOS: WebKitTestRunner hits an assertion in editing/pasteboard/datatransfer-items-copy-plaintext.html
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (222091 => 222092)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2017-09-15 16:34:27 UTC (rev 222092)
@@ -49,10 +49,5 @@
INIT(NSElasticDeltaForReboundDelta);
INIT(NSReboundDeltaForElasticDelta);
#endif
-
- INIT(ExernalDeviceTypeForPlayer);
- INIT(ExernalDeviceDisplayNameForPlayer);
-
- INIT(QueryDecoderAvailability);
});
}
Modified: trunk/Source/WebKitLegacy/mac/ChangeLog (222091 => 222092)
--- trunk/Source/WebKitLegacy/mac/ChangeLog 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebKitLegacy/mac/ChangeLog 2017-09-15 16:34:27 UTC (rev 222092)
@@ -1,3 +1,13 @@
+2017-09-15 Andy Estes <[email protected]>
+
+ [Cocoa] Upstream MediaRemote and VideoToolbox WebKitSystemInterface functions
+ https://bugs.webkit.org/show_bug.cgi?id=176953
+
+ Reviewed by Eric Carlson.
+
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
2017-09-14 Andy Estes <[email protected]>
[Mac] Upstream SpeechSynthesis-related WebKitSystemInterface functions
Modified: trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSystemInterface.mm (222091 => 222092)
--- trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSystemInterface.mm 2017-09-15 16:20:07 UTC (rev 222091)
+++ trunk/Source/WebKitLegacy/mac/WebCoreSupport/WebSystemInterface.mm 2017-09-15 16:34:27 UTC (rev 222092)
@@ -62,10 +62,5 @@
INIT(NSReboundDeltaForElasticDelta);
#endif
- INIT(ExernalDeviceTypeForPlayer);
- INIT(ExernalDeviceDisplayNameForPlayer);
-
- INIT(QueryDecoderAvailability);
-
didInit = true;
}
