Diff
Modified: tags/Safari-607.1.12.1/Source/WTF/wtf/cocoa/SoftLinking.h (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WTF/wtf/cocoa/SoftLinking.h 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WTF/wtf/cocoa/SoftLinking.h 2018-11-02 23:33:24 UTC (rev 237759)
@@ -109,9 +109,6 @@
}
#define SOFT_LINK(framework, functionName, resultType, parameterDeclarations, parameterNames) \
- WTF_EXTERN_C_BEGIN \
- resultType functionName parameterDeclarations; \
- WTF_EXTERN_C_END \
static resultType init##functionName parameterDeclarations; \
static resultType (*softLink##functionName) parameterDeclarations = init##functionName; \
\
@@ -120,17 +117,9 @@
softLink##functionName = (resultType (*) parameterDeclarations) dlsym(framework##Library(), #functionName); \
RELEASE_ASSERT_WITH_MESSAGE(softLink##functionName, "%s", dlerror()); \
return softLink##functionName parameterNames; \
- } \
- \
- inline __attribute__((__always_inline__)) resultType functionName parameterDeclarations \
- { \
- return softLink##functionName parameterNames; \
}
#define SOFT_LINK_MAY_FAIL(framework, functionName, resultType, parameterDeclarations, parameterNames) \
- WTF_EXTERN_C_BEGIN \
- resultType functionName parameterDeclarations; \
- WTF_EXTERN_C_END \
static resultType (*softLink##functionName) parameterDeclarations = 0; \
\
static bool init##functionName() \
@@ -144,12 +133,6 @@
{ \
static bool loaded = init##functionName(); \
return loaded; \
- } \
- \
- inline __attribute__((__always_inline__)) __attribute__((visibility("hidden"))) resultType functionName parameterDeclarations \
- { \
- ASSERT(softLink##functionName); \
- return softLink##functionName parameterNames; \
}
/* callingConvention is unused on Mac but is here to keep the macro prototype the same between Mac and Windows. */
@@ -474,9 +457,6 @@
}
#define SOFT_LINK_FUNCTION_FOR_HEADER(functionNamespace, framework, functionName, resultType, parameterDeclarations, parameterNames) \
- WTF_EXTERN_C_BEGIN \
- resultType functionName parameterDeclarations; \
- WTF_EXTERN_C_END \
namespace functionNamespace { \
extern resultType (*softLink##framework##functionName) parameterDeclarations; \
inline resultType softLink_##framework##_##functionName parameterDeclarations \
@@ -484,15 +464,8 @@
return softLink##framework##functionName parameterNames; \
} \
} \
- inline __attribute__((__always_inline__)) resultType functionName parameterDeclarations \
- {\
- return functionNamespace::softLink##framework##functionName parameterNames; \
- }
#define SOFT_LINK_FUNCTION_FOR_SOURCE(functionNamespace, framework, functionName, resultType, parameterDeclarations, parameterNames) \
- WTF_EXTERN_C_BEGIN \
- resultType functionName parameterDeclarations; \
- WTF_EXTERN_C_END \
namespace functionNamespace { \
static resultType init##framework##functionName parameterDeclarations; \
resultType (*softLink##framework##functionName) parameterDeclarations = init##framework##functionName; \
@@ -508,9 +481,6 @@
}
#define SOFT_LINK_FUNCTION_MAY_FAIL_FOR_HEADER(functionNamespace, framework, functionName, resultType, parameterDeclarations, parameterNames) \
- WTF_EXTERN_C_BEGIN \
- resultType functionName parameterDeclarations; \
- WTF_EXTERN_C_END \
namespace functionNamespace { \
extern resultType (*softLink##framework##functionName) parameterDeclarations; \
bool canLoad_##framework##_##functionName(); \
@@ -519,9 +489,6 @@
}
#define SOFT_LINK_FUNCTION_MAY_FAIL_FOR_SOURCE(functionNamespace, framework, functionName, resultType, parameterDeclarations, parameterNames) \
- WTF_EXTERN_C_BEGIN \
- resultType functionName parameterDeclarations; \
- WTF_EXTERN_C_END \
namespace functionNamespace { \
resultType (*softLink##framework##functionName) parameterDeclarations = 0; \
bool init_##framework##_##functionName(); \
Modified: tags/Safari-607.1.12.1/Source/WebCore/PAL/pal/spi/mac/DataDetectorsSPI.h (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/PAL/pal/spi/mac/DataDetectorsSPI.h 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/PAL/pal/spi/mac/DataDetectorsSPI.h 2018-11-02 23:33:24 UTC (rev 237759)
@@ -116,9 +116,13 @@
SOFT_LINK_CONSTANT(DataDetectorsCore, DDBinderPhoneNumberKey, CFStringRef)
SOFT_LINK(DataDetectors, DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection, DDHighlightRef, (CFAllocatorRef allocator, CGRect* rects, CFIndex count, CGRect globalVisibleRect, DDHighlightStyle style, Boolean withArrow, NSWritingDirection writingDirection, Boolean endsWithEOL, Boolean flipped), (allocator, rects, count, globalVisibleRect, style, withArrow, writingDirection, endsWithEOL, flipped))
+#define DDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection softLinkDDHighlightCreateWithRectsInVisibleRectWithStyleAndDirection
SOFT_LINK(DataDetectors, DDHighlightGetLayerWithContext, CGLayerRef, (DDHighlightRef highlight, CGContextRef context), (highlight, context))
+#define DDHighlightGetLayerWithContext softLinkDDHighlightGetLayerWithContext
SOFT_LINK(DataDetectors, DDHighlightGetBoundingRect, CGRect, (DDHighlightRef highlight), (highlight))
+#define DDHighlightGetBoundingRect softLinkDDHighlightGetBoundingRect
SOFT_LINK(DataDetectors, DDHighlightPointIsOnHighlight, Boolean, (DDHighlightRef highlight, CGPoint point, Boolean* onButton), (highlight, point, onButton))
+#define DDHighlightPointIsOnHighlight softLinkDDHighlightPointIsOnHighlight
#endif
Modified: tags/Safari-607.1.12.1/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/editing/cocoa/WebContentReaderCocoa.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -80,6 +80,7 @@
#if (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300)
SOFT_LINK(WebKitLegacy, _WebCreateFragment, void, (WebCore::Document& document, NSAttributedString *string, WebCore::FragmentAndResources& result), (document, string, result))
+#define _WebCreateFragment softLink_WebCreateFragment
#endif
namespace WebCore {
Modified: tags/Safari-607.1.12.1/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/platform/audio/ios/AudioDestinationIOS.cpp 2018-11-02 23:33:24 UTC (rev 237759)
@@ -46,14 +46,23 @@
SOFT_LINK_FRAMEWORK(AudioToolbox)
SOFT_LINK(AudioToolbox, AudioComponentFindNext, AudioComponent, (AudioComponent inComponent, const AudioComponentDescription *inDesc), (inComponent, inDesc))
+#define AudioComponentFindNext softLinkAudioComponentFindNext
SOFT_LINK(AudioToolbox, AudioComponentInstanceDispose, OSStatus, (AudioComponentInstance inInstance), (inInstance))
+#define AudioComponentInstanceDispose softLinkAudioComponentInstanceDispose
SOFT_LINK(AudioToolbox, AudioComponentInstanceNew, OSStatus, (AudioComponent inComponent, AudioComponentInstance *outInstance), (inComponent, outInstance))
+#define AudioComponentInstanceNew softLinkAudioComponentInstanceNew
SOFT_LINK(AudioToolbox, AudioOutputUnitStart, OSStatus, (AudioUnit ci), (ci))
+#define AudioOutputUnitStart softLinkAudioOutputUnitStart
SOFT_LINK(AudioToolbox, AudioOutputUnitStop, OSStatus, (AudioUnit ci), (ci))
+#define AudioOutputUnitStop softLinkAudioOutputUnitStop
SOFT_LINK(AudioToolbox, AudioUnitAddPropertyListener, OSStatus, (AudioUnit inUnit, AudioUnitPropertyID inID, AudioUnitPropertyListenerProc inProc, void *inProcUserData), (inUnit, inID, inProc, inProcUserData))
+#define AudioUnitAddPropertyListener softLinkAudioUnitAddPropertyListener
SOFT_LINK(AudioToolbox, AudioUnitGetProperty, OSStatus, (AudioUnit inUnit, AudioUnitPropertyID inID, AudioUnitScope inScope, AudioUnitElement inElement, void *outData, UInt32 *ioDataSize), (inUnit, inID, inScope, inElement, outData, ioDataSize))
+#define AudioUnitGetProperty softLinkAudioUnitGetProperty
SOFT_LINK(AudioToolbox, AudioUnitInitialize, OSStatus, (AudioUnit inUnit), (inUnit))
+#define AudioUnitInitialize softLinkAudioUnitInitialize
SOFT_LINK(AudioToolbox, AudioUnitSetProperty, OSStatus, (AudioUnit inUnit, AudioUnitPropertyID inID, AudioUnitScope inScope, AudioUnitElement inElement, const void *inData, UInt32 inDataSize), (inUnit, inID, inScope, inElement, inData, inDataSize))
+#define AudioUnitSetProperty softLinkAudioUnitSetProperty
namespace WebCore {
Modified: tags/Safari-607.1.12.1/Source/WebCore/platform/audio/ios/AudioFileReaderIOS.cpp (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/platform/audio/ios/AudioFileReaderIOS.cpp 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/platform/audio/ios/AudioFileReaderIOS.cpp 2018-11-02 23:33:24 UTC (rev 237759)
@@ -41,13 +41,21 @@
SOFT_LINK_FRAMEWORK(AudioToolbox)
SOFT_LINK(AudioToolbox, AudioFileClose, OSStatus, (AudioFileID inAudioFile), (inAudioFile))
+#define AudioFileClose softLinkAudioFileClose
SOFT_LINK(AudioToolbox, AudioFileOpenWithCallbacks, OSStatus, (void *inClientData, AudioFile_ReadProc inReadFunc, AudioFile_WriteProc inWriteFunc, AudioFile_GetSizeProc inGetSizeFunc, AudioFile_SetSizeProc inSetSizeFunc, AudioFileTypeID inFileTypeHint, AudioFileID *outAudioFile), (inClientData, inReadFunc, inWriteFunc, inGetSizeFunc, inSetSizeFunc, inFileTypeHint, outAudioFile))
+#define AudioFileOpenWithCallbacks softLinkAudioFileOpenWithCallbacks
SOFT_LINK(AudioToolbox, ExtAudioFileDispose, OSStatus, (ExtAudioFileRef inExtAudioFile), (inExtAudioFile))
+#define ExtAudioFileDispose softLinkExtAudioFileDispose
SOFT_LINK(AudioToolbox, ExtAudioFileGetProperty, OSStatus, (ExtAudioFileRef inExtAudioFile, ExtAudioFilePropertyID inPropertyID, UInt32 *ioPropertyDataSize, void *outPropertyData), (inExtAudioFile, inPropertyID, ioPropertyDataSize, outPropertyData))
+#define ExtAudioFileGetProperty softLinkExtAudioFileGetProperty
SOFT_LINK(AudioToolbox, ExtAudioFileRead, OSStatus, (ExtAudioFileRef inExtAudioFile, UInt32 *ioNumberFrames, AudioBufferList *ioData), (inExtAudioFile, ioNumberFrames, ioData))
+#define ExtAudioFileRead softLinkExtAudioFileRead
SOFT_LINK(AudioToolbox, ExtAudioFileSetProperty, OSStatus, (ExtAudioFileRef inExtAudioFile, ExtAudioFilePropertyID inPropertyID, UInt32 inPropertyDataSize, const void *inPropertyData), (inExtAudioFile, inPropertyID, inPropertyDataSize, inPropertyData))
+#define ExtAudioFileSetProperty softLinkExtAudioFileSetProperty
SOFT_LINK(AudioToolbox, ExtAudioFileWrapAudioFileID, OSStatus, (AudioFileID inFileID, Boolean inForWriting, ExtAudioFileRef *outExtAudioFile), (inFileID, inForWriting, outExtAudioFile))
+#define ExtAudioFileWrapAudioFileID softLinkExtAudioFileWrapAudioFileID
SOFT_LINK(AudioToolbox, ExtAudioFileOpenURL, OSStatus, (CFURLRef inURL, ExtAudioFileRef* outExtAudioFile), (inURL, outExtAudioFile))
+#define ExtAudioFileOpenURL softLinkExtAudioFileOpenURL
namespace WebCore {
Modified: tags/Safari-607.1.12.1/Source/WebCore/platform/cocoa/TelephoneNumberDetectorCocoa.cpp (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/platform/cocoa/TelephoneNumberDetectorCocoa.cpp 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/platform/cocoa/TelephoneNumberDetectorCocoa.cpp 2018-11-02 23:33:24 UTC (rev 237759)
@@ -39,8 +39,11 @@
SOFT_LINK_PRIVATE_FRAMEWORK_OPTIONAL(DataDetectorsCore)
SOFT_LINK(DataDetectorsCore, DDDFACacheCreateFromFramework, struct __DDDFACache*, (), ())
+#define DDDFACacheCreateFromFramework softLinkDDDFACacheCreateFromFramework
SOFT_LINK(DataDetectorsCore, DDDFAScannerCreateFromCache, DDDFAScannerRef, (struct __DDDFACache* cache), (cache))
+#define DDDFAScannerCreateFromCache softLinkDDDFAScannerCreateFromCache
SOFT_LINK(DataDetectorsCore, DDDFAScannerFirstResultInUnicharArray, Boolean, (DDDFAScannerRef scanner, const UniChar* str, unsigned length, int* startPos, int* endPos), (scanner, str, length, startPos, endPos))
+#define DDDFAScannerFirstResultInUnicharArray softLinkDDDFAScannerFirstResultInUnicharArray
namespace WebCore {
namespace TelephoneNumberDetector {
Modified: tags/Safari-607.1.12.1/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/platform/graphics/avfoundation/AudioSourceProviderAVFObjC.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -58,11 +58,16 @@
SOFT_LINK_CLASS(AVFoundation, AVMutableAudioMixInputParameters)
SOFT_LINK(AudioToolbox, AudioConverterConvertComplexBuffer, OSStatus, (AudioConverterRef inAudioConverter, UInt32 inNumberPCMFrames, const AudioBufferList* inInputData, AudioBufferList* outOutputData), (inAudioConverter, inNumberPCMFrames, inInputData, outOutputData))
+#define AudioConverterConvertComplexBuffer softLinkAudioConverterConvertComplexBuffer
SOFT_LINK(AudioToolbox, AudioConverterNew, OSStatus, (const AudioStreamBasicDescription* inSourceFormat, const AudioStreamBasicDescription* inDestinationFormat, AudioConverterRef* outAudioConverter), (inSourceFormat, inDestinationFormat, outAudioConverter))
+#define AudioConverterNew softLinkAudioConverterNew
SOFT_LINK(MediaToolbox, MTAudioProcessingTapGetStorage, void*, (MTAudioProcessingTapRef tap), (tap))
+#define MTAudioProcessingTapGetStorage softLinkMTAudioProcessingTapGetStorage
SOFT_LINK(MediaToolbox, MTAudioProcessingTapGetSourceAudio, OSStatus, (MTAudioProcessingTapRef tap, CMItemCount numberFrames, AudioBufferList *bufferListInOut, MTAudioProcessingTapFlags *flagsOut, CMTimeRange *timeRangeOut, CMItemCount *numberFramesOut), (tap, numberFrames, bufferListInOut, flagsOut, timeRangeOut, numberFramesOut))
+#define MTAudioProcessingTapGetSourceAudio softLinkMTAudioProcessingTapGetSourceAudio
SOFT_LINK_MAY_FAIL(MediaToolbox, MTAudioProcessingTapCreate, OSStatus, (CFAllocatorRef allocator, const MTAudioProcessingTapCallbacks *callbacks, MTAudioProcessingTapCreationFlags flags, MTAudioProcessingTapRef *tapOut), (allocator, callbacks, flags, tapOut))
+#define MTAudioProcessingTapCreate softLinkMTAudioProcessingTapCreate
namespace WebCore {
Modified: tags/Safari-607.1.12.1/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/platform/graphics/cocoa/FontCascadeCocoa.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -47,6 +47,7 @@
SOFT_LINK_FRAMEWORK(UIKit)
SOFT_LINK(UIKit, _UIKitGetTextEffectsCatalog, CUICatalog *, (void), ())
+#define _UIKitGetTextEffectsCatalog softLink_UIKitGetTextEffectsCatalog
#endif
#ifdef __LP64__
Modified: tags/Safari-607.1.12.1/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.cpp (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.cpp 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/platform/graphics/cv/PixelBufferConformerCV.cpp 2018-11-02 23:33:24 UTC (rev 237759)
@@ -38,8 +38,11 @@
#if USE(VIDEOTOOLBOX)
SOFT_LINK_FRAMEWORK_OPTIONAL(VideoToolbox)
SOFT_LINK(VideoToolbox, VTPixelBufferConformerCreateWithAttributes, OSStatus, (CFAllocatorRef allocator, CFDictionaryRef attributes, VTPixelBufferConformerRef* conformerOut), (allocator, attributes, conformerOut));
+#define VTPixelBufferConformerCreateWithAttributes softLinkVTPixelBufferConformerCreateWithAttributes
SOFT_LINK(VideoToolbox, VTPixelBufferConformerIsConformantPixelBuffer, Boolean, (VTPixelBufferConformerRef conformer, CVPixelBufferRef pixBuf), (conformer, pixBuf))
+#define VTPixelBufferConformerIsConformantPixelBuffer softLinkVTPixelBufferConformerIsConformantPixelBuffer
SOFT_LINK(VideoToolbox, VTPixelBufferConformerCopyConformedPixelBuffer, OSStatus, (VTPixelBufferConformerRef conformer, CVPixelBufferRef sourceBuffer, Boolean ensureModifiable, CVPixelBufferRef* conformedBufferOut), (conformer, sourceBuffer, ensureModifiable, conformedBufferOut))
+#define VTPixelBufferConformerCopyConformedPixelBuffer softLinkVTPixelBufferConformerCopyConformedPixelBuffer
#endif
namespace WebCore {
Modified: tags/Safari-607.1.12.1/Source/WebCore/platform/ios/DragImageIOS.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/platform/ios/DragImageIOS.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/platform/ios/DragImageIOS.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -58,9 +58,13 @@
SOFT_LINK_CLASS(UIKit, UIFont)
SOFT_LINK_CLASS(UIKit, UIGraphicsImageRenderer)
SOFT_LINK(UIKit, UIGraphicsBeginImageContextWithOptions, void, (CGSize size, BOOL opaque, CGFloat scale), (size, opaque, scale))
+#define UIGraphicsBeginImageContextWithOptions softLinkUIGraphicsBeginImageContextWithOptions
SOFT_LINK(UIKit, UIGraphicsGetCurrentContext, CGContextRef, (void), ())
+#define UIGraphicsGetCurrentContext softLinkUIGraphicsGetCurrentContext
SOFT_LINK(UIKit, UIGraphicsGetImageFromCurrentImageContext, UIImage *, (void), ())
+#define UIGraphicsGetImageFromCurrentImageContext softLinkUIGraphicsGetImageFromCurrentImageContext
SOFT_LINK(UIKit, UIGraphicsEndImageContext, void, (void), ())
+#define UIGraphicsEndImageContext softLinkUIGraphicsEndImageContext
IGNORE_CLANG_WARNINGS_END
Modified: tags/Safari-607.1.12.1/Source/WebCore/platform/ios/ThemeIOS.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/platform/ios/ThemeIOS.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/platform/ios/ThemeIOS.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -33,6 +33,7 @@
SOFT_LINK_FRAMEWORK(UIKit)
SOFT_LINK(UIKit, UIAccessibilityIsReduceMotionEnabled, BOOL, (void), ())
+#define UIAccessibilityIsReduceMotionEnabled softLinkUIAccessibilityIsReduceMotionEnabled
using namespace std;
Modified: tags/Safari-607.1.12.1/Source/WebCore/platform/ios/ValidationBubbleIOS.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/platform/ios/ValidationBubbleIOS.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/platform/ios/ValidationBubbleIOS.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -43,8 +43,8 @@
SOFT_LINK_CLASS(UIKit, UIViewController);
SOFT_LINK_CONSTANT(UIKit, UIFontTextStyleCallout, UIFontTextStyle);
SOFT_LINK_CONSTANT(UIKit, UIAccessibilityAnnouncementNotification, UIAccessibilityNotifications);
-#define UIAccessibilityPostNotification getUIAccessibilityPostNotification
SOFT_LINK(UIKit, UIAccessibilityPostNotification, void, (UIAccessibilityNotifications n, id argument), (n, argument));
+#define UIAccessibilityPostNotification softLinkUIAccessibilityPostNotification
@interface WebValidationBubbleTapRecognizer : NSObject
@end
Modified: tags/Safari-607.1.12.1/Source/WebCore/platform/mediastream/mac/MockRealtimeAudioSourceMac.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/platform/mediastream/mac/MockRealtimeAudioSourceMac.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/platform/mediastream/mac/MockRealtimeAudioSourceMac.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -50,6 +50,7 @@
SOFT_LINK_FRAMEWORK(AudioToolbox)
SOFT_LINK(AudioToolbox, AudioConverterNew, OSStatus, (const AudioStreamBasicDescription* inSourceFormat, const AudioStreamBasicDescription* inDestinationFormat, AudioConverterRef* outAudioConverter), (inSourceFormat, inDestinationFormat, outAudioConverter))
+#define AudioConverterNew softLinkAudioConverterNew
namespace WebCore {
using namespace PAL;
Modified: tags/Safari-607.1.12.1/Source/WebCore/platform/network/mac/BlobDataFileReferenceMac.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/platform/network/mac/BlobDataFileReferenceMac.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/platform/network/mac/BlobDataFileReferenceMac.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -41,8 +41,11 @@
SOFT_LINK_PRIVATE_FRAMEWORK(Bom)
SOFT_LINK(Bom, BOMCopierNew, BOMCopier, (), ())
+#define BOMCopierNew softLinkBOMCopierNew
SOFT_LINK(Bom, BOMCopierFree, void, (BOMCopier copier), (copier))
+#define BOMCopierFree softLinkBOMCopierFree
SOFT_LINK(Bom, BOMCopierCopyWithOptions, int, (BOMCopier copier, const char* fromObj, const char* toObj, CFDictionaryRef options), (copier, fromObj, toObj, options))
+#define BOMCopierCopyWithOptions softLinkBOMCopierCopyWithOptions
#define kBOMCopierOptionCreatePKZipKey CFSTR("createPKZip")
#define kBOMCopierOptionSequesterResourcesKey CFSTR("sequesterResources")
Modified: tags/Safari-607.1.12.1/Source/WebCore/rendering/RenderThemeCocoa.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/rendering/RenderThemeCocoa.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/rendering/RenderThemeCocoa.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -41,6 +41,7 @@
#endif
SOFT_LINK_MAY_FAIL(PassKit, PKDrawApplePayButton, void, (CGContextRef context, CGRect drawRect, CGFloat scale, PKPaymentButtonType type, PKPaymentButtonStyle style, NSString *languageCode), (context, drawRect, scale, type, style, languageCode));
+#define PKDrawApplePayButton softLinkPKDrawApplePayButton
#endif // ENABLE(APPLE_PAY)
Modified: tags/Safari-607.1.12.1/Source/WebCore/testing/Internals.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/testing/Internals.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/testing/Internals.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -38,6 +38,7 @@
#if PLATFORM(IOS_FAMILY)
SOFT_LINK_FRAMEWORK(UIKit)
SOFT_LINK(UIKit, UIAccessibilityIsReduceMotionEnabled, BOOL, (void), ())
+#define UIAccessibilityIsReduceMotionEnabled softLinkUIAccessibilityIsReduceMotionEnabled
#endif
namespace WebCore {
Modified: tags/Safari-607.1.12.1/Source/WebCore/xml/SoftLinkLibxslt.h (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/xml/SoftLinkLibxslt.h 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/xml/SoftLinkLibxslt.h 2018-11-02 23:33:24 UTC (rev 237759)
@@ -28,6 +28,8 @@
#if OS(DARWIN) && !PLATFORM(GTK)
#include <libxslt/documents.h>
+#include <libxslt/extensions.h>
+#include <libxslt/extra.h>
#include <libxslt/imports.h>
#include <libxslt/security.h>
#include <libxslt/templates.h>
@@ -39,28 +41,49 @@
SOFT_LINK_LIBRARY_FOR_HEADER(WebCore, libxslt)
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltFreeStylesheet, void, (xsltStylesheetPtr sheet), (sheet))
+#define xsltFreeStylesheet softLink_libxslt_xsltFreeStylesheet
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltFreeTransformContext, void, (xsltTransformContextPtr ctxt), (ctxt))
+#define xsltFreeTransformContext softLink_libxslt_xsltFreeTransformContext
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltNewTransformContext, xsltTransformContextPtr, (xsltStylesheetPtr style, xmlDocPtr doc), (style, doc))
+#define xsltNewTransformContext softLink_libxslt_xsltNewTransformContext
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltApplyStylesheetUser, xmlDocPtr, (xsltStylesheetPtr style, xmlDocPtr doc, const char** params, const char* output, FILE* profile, xsltTransformContextPtr userCtxt), (style, doc, params, output, profile, userCtxt))
+#define xsltApplyStylesheetUser softLink_libxslt_xsltApplyStylesheetUser
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltQuoteUserParams, int, (xsltTransformContextPtr ctxt, const char** params), (ctxt, params))
+#define xsltQuoteUserParams softLink_libxslt_xsltQuoteUserParams
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltSetCtxtSortFunc, void, (xsltTransformContextPtr ctxt, xsltSortFunc handler), (ctxt, handler))
+#define xsltSetCtxtSortFunc softLink_libxslt_xsltSetCtxtSortFunc
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltSetLoaderFunc, void, (xsltDocLoaderFunc f), (f))
+#define xsltSetLoaderFunc softLink_libxslt_xsltSetLoaderFunc
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltSaveResultTo, int, (xmlOutputBufferPtr buf, xmlDocPtr result, xsltStylesheetPtr style), (buf, result, style))
+#define xsltSaveResultTo softLink_libxslt_xsltSaveResultTo
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltNextImport, xsltStylesheetPtr, (xsltStylesheetPtr style), (style))
+#define xsltNextImport softLink_libxslt_xsltNextImport
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltNewSecurityPrefs, xsltSecurityPrefsPtr, (), ())
+#define xsltNewSecurityPrefs softLink_libxslt_xsltNewSecurityPrefs
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltFreeSecurityPrefs, void, (xsltSecurityPrefsPtr sec), (sec))
+#define xsltFreeSecurityPrefs softLink_libxslt_xsltFreeSecurityPrefs
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltSetSecurityPrefs, int, (xsltSecurityPrefsPtr sec, xsltSecurityOption option, xsltSecurityCheck func), (sec, option, func))
+#define xsltSetSecurityPrefs softLink_libxslt_xsltSetSecurityPrefs
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltSetCtxtSecurityPrefs, int, (xsltSecurityPrefsPtr sec, xsltTransformContextPtr ctxt), (sec, ctxt))
+#define xsltSetCtxtSecurityPrefs softLink_libxslt_xsltSetCtxtSecurityPrefs
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltSecurityForbid, int, (xsltSecurityPrefsPtr sec, xsltTransformContextPtr ctxt, const char* value), (sec, ctxt, value))
+#define xsltSecurityForbid softLink_libxslt_xsltSecurityForbid
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltGetNsProp, xmlChar *, (xmlNodePtr node, const xmlChar *name, const xmlChar *nameSpace), (node, name, nameSpace))
+#define xsltGetNsProp softLink_libxslt_xsltGetNsProp
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltParseStylesheetDoc, xsltStylesheetPtr, (xmlDocPtr doc), (doc))
+#define xsltParseStylesheetDoc softLink_libxslt_xsltParseStylesheetDoc
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltLoadStylesheetPI, xsltStylesheetPtr, (xmlDocPtr doc), (doc))
+#define xsltLoadStylesheetPI softLink_libxslt_xsltLoadStylesheetPI
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltRegisterExtFunction, int, (xsltTransformContextPtr ctxt, const xmlChar *name, const xmlChar *URI, xmlXPathFunction function), (ctxt, name, URI, function))
+#define xsltRegisterExtFunction softLink_libxslt_xsltRegisterExtFunction
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltFunctionNodeSet, void, (xmlXPathParserContextPtr ctxt, int nargs), (ctxt, nargs))
+#define xsltFunctionNodeSet softLink_libxslt_xsltFunctionNodeSet
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltComputeSortResult, xmlXPathObjectPtr*, (xsltTransformContextPtr ctxt, xmlNodePtr sort), (ctxt, sort))
+#define xsltComputeSortResult softLink_libxslt_xsltComputeSortResult
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltEvalAttrValueTemplate, xmlChar*, (xsltTransformContextPtr ctxt, xmlNodePtr node, const xmlChar *name, const xmlChar *ns), (ctxt, node, name, ns))
+#define xsltEvalAttrValueTemplate softLink_libxslt_xsltEvalAttrValueTemplate
SOFT_LINK_VARIABLE_FOR_HEADER(WebCore, libxslt, xsltMaxDepth, int);
#define xsltMaxDepth get_libxslt_xsltMaxDepth()
Modified: tags/Safari-607.1.12.1/Source/WebCore/xml/XSLTExtensions.cpp (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebCore/xml/XSLTExtensions.cpp 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebCore/xml/XSLTExtensions.cpp 2018-11-02 23:33:24 UTC (rev 237759)
@@ -32,11 +32,12 @@
#include <libxml/xpathInternals.h>
#include <libxslt/xsltutils.h>
-#include <libxslt/extensions.h>
-#include <libxslt/extra.h>
#if OS(DARWIN) && !PLATFORM(GTK)
#include "SoftLinkLibxslt.h"
+#else
+#include <libxslt/extensions.h>
+#include <libxslt/extra.h>
#endif
namespace WebCore {
Modified: tags/Safari-607.1.12.1/Source/WebKit/Platform/mac/StringUtilities.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebKit/Platform/mac/StringUtilities.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebKit/Platform/mac/StringUtilities.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -50,12 +50,15 @@
// We currently don't have a way to soft link such functions, so we forward declare them again here.
extern "C" CFPhoneNumberRef CFPhoneNumberCreate(CFAllocatorRef, CFStringRef, CFStringRef);
SOFT_LINK(PhoneNumbers, CFPhoneNumberCreate, CFPhoneNumberRef, (CFAllocatorRef allocator, CFStringRef digits, CFStringRef countryCode), (allocator, digits, countryCode));
+#define CFPhoneNumberCreate softLinkCFPhoneNumberCreate
extern "C" CFStringRef CFPhoneNumberCopyFormattedRepresentation(CFPhoneNumberRef);
SOFT_LINK(PhoneNumbers, CFPhoneNumberCopyFormattedRepresentation, CFStringRef, (CFPhoneNumberRef phoneNumber), (phoneNumber));
+#define CFPhoneNumberCopyFormattedRepresentation softLinkCFPhoneNumberCopyFormattedRepresentation
extern "C" CFStringRef CFPhoneNumberCopyUnformattedRepresentation(CFPhoneNumberRef);
SOFT_LINK(PhoneNumbers, CFPhoneNumberCopyUnformattedRepresentation, CFStringRef, (CFPhoneNumberRef phoneNumber), (phoneNumber));
+#define CFPhoneNumberCopyUnformattedRepresentation softLinkCFPhoneNumberCopyUnformattedRepresentation
NSString *formattedPhoneNumberString(NSString *originalPhoneNumber)
Modified: tags/Safari-607.1.12.1/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -60,6 +60,7 @@
SOFT_LINK_PRIVATE_FRAMEWORK(TCC)
SOFT_LINK(TCC, TCCAccessPreflight, TCCAccessPreflightResult, (CFStringRef service, CFDictionaryRef options), (service, options))
+#define TCCAccessPreflight softLinkTCCAccessPreflight
SOFT_LINK_CONSTANT(TCC, kTCCServicePhotos, CFStringRef)
#if HAVE(APP_LINKS)
Modified: tags/Safari-607.1.12.1/Source/WebKitLegacy/mac/WebView/WebView.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Source/WebKitLegacy/mac/WebView/WebView.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -342,9 +342,13 @@
SOFT_LINK_CLASS(UIKit, UIColor)
SOFT_LINK_CLASS(UIKit, UIImage)
SOFT_LINK(UIKit, UIGraphicsBeginImageContextWithOptions, void, (CGSize size, BOOL opaque, CGFloat scale), (size, opaque, scale))
+#define UIGraphicsBeginImageContextWithOptions softLinkUIGraphicsBeginImageContextWithOptions
SOFT_LINK(UIKit, UIGraphicsGetCurrentContext, CGContextRef, (void), ())
+#define UIGraphicsGetCurrentContext softLinkUIGraphicsGetCurrentContext
SOFT_LINK(UIKit, UIGraphicsGetImageFromCurrentImageContext, UIImage *, (void), ())
+#define UIGraphicsGetImageFromCurrentImageContext softLinkUIGraphicsGetImageFromCurrentImageContext
SOFT_LINK(UIKit, UIGraphicsEndImageContext, void, (void), ())
+#define UIGraphicsEndImageContext softLinkUIGraphicsEndImageContext
#endif
#if HAVE(TOUCH_BAR) && ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
Modified: tags/Safari-607.1.12.1/Tools/TestWebKitAPI/Tests/WebKitCocoa/NowPlaying.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Tools/TestWebKitAPI/Tests/WebKitCocoa/NowPlaying.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Tools/TestWebKitAPI/Tests/WebKitCocoa/NowPlaying.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -41,8 +41,11 @@
SOFT_LINK_PRIVATE_FRAMEWORK(MediaRemote)
SOFT_LINK(MediaRemote, MRMediaRemoteSetWantsNowPlayingNotifications, void, (bool wantsNotifications), (wantsNotifications))
+#define MRMediaRemoteSetWantsNowPlayingNotifications softLinkMRMediaRemoteSetWantsNowPlayingNotifications
SOFT_LINK(MediaRemote, MRMediaRemoteGetNowPlayingClient, void, (dispatch_queue_t queue, void(^completion)(MRNowPlayingClientRef, CFErrorRef)), (queue, completion))
+#define MRMediaRemoteGetNowPlayingClient softLinkMRMediaRemoteGetNowPlayingClient
SOFT_LINK(MediaRemote, MRNowPlayingClientGetProcessIdentifier, pid_t, (MRNowPlayingClientRef client), (client))
+#define MRNowPlayingClientGetProcessIdentifier softLinkMRNowPlayingClientGetProcessIdentifier
SOFT_LINK_CONSTANT(MediaRemote, kMRMediaRemoteNowPlayingApplicationDidChangeNotification, CFStringRef)
SOFT_LINK_CONSTANT(MediaRemote, kMRMediaRemoteNowPlayingApplicationPIDUserInfoKey, CFStringRef)
#define MRMediaRemoteSetWantsNowPlayingNotifications softLinkMRMediaRemoteSetWantsNowPlayingNotifications
Modified: tags/Safari-607.1.12.1/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -43,6 +43,7 @@
SOFT_LINK_FRAMEWORK(UIKit)
SOFT_LINK(UIKit, UIApplicationInstantiateSingleton, void, (Class singletonClass), (singletonClass))
+#define UIApplicationInstantiateSingleton softLinkUIApplicationInstantiateSingleton
using namespace TestWebKitAPI;
Modified: tags/Safari-607.1.12.1/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm (237758 => 237759)
--- tags/Safari-607.1.12.1/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm 2018-11-02 23:20:42 UTC (rev 237758)
+++ tags/Safari-607.1.12.1/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm 2018-11-02 23:33:24 UTC (rev 237759)
@@ -38,6 +38,7 @@
SOFT_LINK_PRIVATE_FRAMEWORK(BackBoardServices)
SOFT_LINK(BackBoardServices, BKSHIDEventSetDigitizerInfo, void, (IOHIDEventRef digitizerEvent, uint32_t contextID, uint8_t systemGestureisPossible, uint8_t isSystemGestureStateChangeEvent, CFStringRef displayUUID, CFTimeInterval initialTouchTimestamp, float maxForce), (digitizerEvent, contextID, systemGestureisPossible, isSystemGestureStateChangeEvent, displayUUID, initialTouchTimestamp, maxForce));
+#define BKSHIDEventSetDigitizerInfo softLinkBKSHIDEventSetDigitizerInfo
NSString* const TopLevelEventInfoKey = @"events";
NSString* const HIDEventInputType = @"inputType";
