Diff
Modified: branches/safari-612.1.10-branch/Source/WTF/ChangeLog (275776 => 275777)
--- branches/safari-612.1.10-branch/Source/WTF/ChangeLog 2021-04-09 20:37:28 UTC (rev 275776)
+++ branches/safari-612.1.10-branch/Source/WTF/ChangeLog 2021-04-09 20:37:32 UTC (rev 275777)
@@ -1,3 +1,54 @@
+2021-04-09 Alan Coon <[email protected]>
+
+ Cherry-pick r275775. rdar://problem/76467684
+
+ WTF SoftLinking macros can cause collisions with their target functions
+ https://bugs.webkit.org/show_bug.cgi?id=224379
+ <rdar://76434202>
+
+ Reviewed by Eric Carlson.
+
+ Source/WebCore:
+
+ Don't include the SoftLinkLibxslt.h file in the .cpp file.
+
+ * xml/SoftLinkLibxslt.cpp:
+ * xml/SoftLinkLibxslt.h:
+
+ Source/WebCore/PAL:
+
+ * pal/cf/CoreMediaSoftLink.h:
+ * pal/cocoa/MediaToolboxSoftLink.h:
+ * pal/cocoa/OpenGLSoftLinkCocoa.h:
+ * pal/cocoa/PassKitSoftLink.h:
+ * pal/ios/UIKitSoftLink.h:
+ * pal/spi/cocoa/AccessibilitySupportSoftLink.cpp:
+ * pal/spi/cocoa/AccessibilitySupportSoftLink.h:
+
+ Source/WTF:
+
+ Do not declare an inline version of the target function, as this will collide if the target function
+ becomes inlined. Instead, callers should use the explicit softLink_Library_Function() syntax, or
+ the LibrarySoftLinking.h headers should use #defines to re-declare the function name.
+
+ * wtf/cocoa/SoftLinking.h:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275775 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-09 Jer Noble <[email protected]>
+
+ WTF SoftLinking macros can cause collisions with their target functions
+ https://bugs.webkit.org/show_bug.cgi?id=224379
+ <rdar://76434202>
+
+ Reviewed by Eric Carlson.
+
+ Do not declare an inline version of the target function, as this will collide if the target function
+ becomes inlined. Instead, callers should use the explicit softLink_Library_Function() syntax, or
+ the LibrarySoftLinking.h headers should use #defines to re-declare the function name.
+
+ * wtf/cocoa/SoftLinking.h:
+
2021-04-02 Simon Fraser <[email protected]>
Enable PreferPageRenderingUpdatesNear60FPSEnabled by default
Modified: branches/safari-612.1.10-branch/Source/WTF/wtf/cocoa/SoftLinking.h (275776 => 275777)
--- branches/safari-612.1.10-branch/Source/WTF/wtf/cocoa/SoftLinking.h 2021-04-09 20:37:28 UTC (rev 275776)
+++ branches/safari-612.1.10-branch/Source/WTF/wtf/cocoa/SoftLinking.h 2021-04-09 20:37:32 UTC (rev 275777)
@@ -326,6 +326,7 @@
#define SOFT_LINK_LIBRARY_FOR_HEADER(functionNamespace, lib) \
namespace functionNamespace { \
extern void* lib##Library(bool isOptional = false); \
+ bool is##lib##LibraryAvailable(); \
inline bool is##lib##LibaryAvailable() { \
return lib##Library(true) != nullptr; \
} \
@@ -333,7 +334,7 @@
#define SOFT_LINK_LIBRARY_FOR_SOURCE(functionNamespace, lib) \
namespace functionNamespace { \
- void* lib##Library(bool isOptional); \
+ extern void* lib##Library(bool isOptional = false); \
void* lib##Library(bool isOptional) \
{ \
static void* library; \
@@ -516,10 +517,6 @@
return softLink##framework##functionName parameterNames; \
} \
} \
- inline __attribute__((__always_inline__)) resultType functionName parameterDeclarations \
- {\
- return functionNamespace::softLink##framework##functionName parameterNames; \
- }
#define SOFT_LINK_FUNCTION_FOR_SOURCE_WITH_EXPORT(functionNamespace, framework, functionName, resultType, parameterDeclarations, parameterNames, export) \
WTF_EXTERN_C_BEGIN \
Modified: branches/safari-612.1.10-branch/Source/WebCore/ChangeLog (275776 => 275777)
--- branches/safari-612.1.10-branch/Source/WebCore/ChangeLog 2021-04-09 20:37:28 UTC (rev 275776)
+++ branches/safari-612.1.10-branch/Source/WebCore/ChangeLog 2021-04-09 20:37:32 UTC (rev 275777)
@@ -1,3 +1,53 @@
+2021-04-09 Alan Coon <[email protected]>
+
+ Cherry-pick r275775. rdar://problem/76467684
+
+ WTF SoftLinking macros can cause collisions with their target functions
+ https://bugs.webkit.org/show_bug.cgi?id=224379
+ <rdar://76434202>
+
+ Reviewed by Eric Carlson.
+
+ Source/WebCore:
+
+ Don't include the SoftLinkLibxslt.h file in the .cpp file.
+
+ * xml/SoftLinkLibxslt.cpp:
+ * xml/SoftLinkLibxslt.h:
+
+ Source/WebCore/PAL:
+
+ * pal/cf/CoreMediaSoftLink.h:
+ * pal/cocoa/MediaToolboxSoftLink.h:
+ * pal/cocoa/OpenGLSoftLinkCocoa.h:
+ * pal/cocoa/PassKitSoftLink.h:
+ * pal/ios/UIKitSoftLink.h:
+ * pal/spi/cocoa/AccessibilitySupportSoftLink.cpp:
+ * pal/spi/cocoa/AccessibilitySupportSoftLink.h:
+
+ Source/WTF:
+
+ Do not declare an inline version of the target function, as this will collide if the target function
+ becomes inlined. Instead, callers should use the explicit softLink_Library_Function() syntax, or
+ the LibrarySoftLinking.h headers should use #defines to re-declare the function name.
+
+ * wtf/cocoa/SoftLinking.h:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275775 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-09 Jer Noble <[email protected]>
+
+ WTF SoftLinking macros can cause collisions with their target functions
+ https://bugs.webkit.org/show_bug.cgi?id=224379
+ <rdar://76434202>
+
+ Reviewed by Eric Carlson.
+
+ Don't include the SoftLinkLibxslt.h file in the .cpp file.
+
+ * xml/SoftLinkLibxslt.cpp:
+ * xml/SoftLinkLibxslt.h:
+
2021-04-02 Ryosuke Niwa <[email protected]>
PendingImageBitmap gets created on a stopped script execution context.
Modified: branches/safari-612.1.10-branch/Source/WebCore/PAL/ChangeLog (275776 => 275777)
--- branches/safari-612.1.10-branch/Source/WebCore/PAL/ChangeLog 2021-04-09 20:37:28 UTC (rev 275776)
+++ branches/safari-612.1.10-branch/Source/WebCore/PAL/ChangeLog 2021-04-09 20:37:32 UTC (rev 275777)
@@ -1,5 +1,58 @@
2021-04-09 Alan Coon <[email protected]>
+ Cherry-pick r275775. rdar://problem/76467684
+
+ WTF SoftLinking macros can cause collisions with their target functions
+ https://bugs.webkit.org/show_bug.cgi?id=224379
+ <rdar://76434202>
+
+ Reviewed by Eric Carlson.
+
+ Source/WebCore:
+
+ Don't include the SoftLinkLibxslt.h file in the .cpp file.
+
+ * xml/SoftLinkLibxslt.cpp:
+ * xml/SoftLinkLibxslt.h:
+
+ Source/WebCore/PAL:
+
+ * pal/cf/CoreMediaSoftLink.h:
+ * pal/cocoa/MediaToolboxSoftLink.h:
+ * pal/cocoa/OpenGLSoftLinkCocoa.h:
+ * pal/cocoa/PassKitSoftLink.h:
+ * pal/ios/UIKitSoftLink.h:
+ * pal/spi/cocoa/AccessibilitySupportSoftLink.cpp:
+ * pal/spi/cocoa/AccessibilitySupportSoftLink.h:
+
+ Source/WTF:
+
+ Do not declare an inline version of the target function, as this will collide if the target function
+ becomes inlined. Instead, callers should use the explicit softLink_Library_Function() syntax, or
+ the LibrarySoftLinking.h headers should use #defines to re-declare the function name.
+
+ * wtf/cocoa/SoftLinking.h:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@275775 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-04-09 Jer Noble <[email protected]>
+
+ WTF SoftLinking macros can cause collisions with their target functions
+ https://bugs.webkit.org/show_bug.cgi?id=224379
+ <rdar://76434202>
+
+ Reviewed by Eric Carlson.
+
+ * pal/cf/CoreMediaSoftLink.h:
+ * pal/cocoa/MediaToolboxSoftLink.h:
+ * pal/cocoa/OpenGLSoftLinkCocoa.h:
+ * pal/cocoa/PassKitSoftLink.h:
+ * pal/ios/UIKitSoftLink.h:
+ * pal/spi/cocoa/AccessibilitySupportSoftLink.cpp:
+ * pal/spi/cocoa/AccessibilitySupportSoftLink.h:
+
+2021-04-09 Alan Coon <[email protected]>
+
Cherry-pick r275736. rdar://problem/76467285
Fix incorrect compile-time macro for CFNETWORK_NSURLSESSION_ATTRIBUTED_BUNDLE_IDENTIFIER
Modified: branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h (275776 => 275777)
--- branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2021-04-09 20:37:28 UTC (rev 275776)
+++ branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2021-04-09 20:37:32 UTC (rev 275777)
@@ -351,8 +351,11 @@
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMAudioDeviceClockCreate, OSStatus, (CFAllocatorRef allocator, CFStringRef deviceUID, CMClockRef *clockOut), (allocator, deviceUID, clockOut))
#define CMAudioDeviceClockCreate softLink_CoreMedia_CMAudioDeviceClockCreate
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMBaseObjectGetDerivedStorage, void*, (CMBaseObjectRef baseObject), (baseObject))
+#define CMBaseObjectGetDerivedStorage PAL::softLink_CoreMedia_CMBaseObjectGetDerivedStorage
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMBaseObjectGetVTable, const CMBaseVTable*, (CMBaseObjectRef baseObject), (baseObject))
+#define CMBaseObjectGetVTable PAL::softLink_CoreMedia_CMBaseObjectGetVTable
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMDerivedObjectCreate, OSStatus, (CFAllocatorRef allocator, const CMBaseVTable* vTable, CMBaseClassID classID, CMBaseObjectRef* baseObject), (allocator, vTable, classID, baseObject))
+#define CMDerivedObjectCreate PAL::softLink_CoreMedia_CMDerivedObjectCreate
#endif // PLATFORM(MAC)
Modified: branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/cocoa/MediaToolboxSoftLink.h (275776 => 275777)
--- branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/cocoa/MediaToolboxSoftLink.h 2021-04-09 20:37:28 UTC (rev 275776)
+++ branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/cocoa/MediaToolboxSoftLink.h 2021-04-09 20:37:32 UTC (rev 275777)
@@ -50,15 +50,25 @@
SOFT_LINK_CONSTANT_MAY_FAIL_FOR_HEADER(PAL, MediaToolbox, kMTPluginFormatReader_SupportsPlayableHorizonQueries, CFStringRef)
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, MediaToolbox, MTPluginByteSourceGetLength, int64_t, (MTPluginByteSourceRef byteSource), (byteSource))
+#define MTPluginByteSourceGetLength PAL::softLink_MediaToolbox_MTPluginByteSourceGetLength
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, MediaToolbox, MTPluginByteSourceRead, OSStatus, (MTPluginByteSourceRef byteSource, size_t num, int64_t offset, void* dest, size_t* bytesReadOut), (byteSource, num, offset, dest, bytesReadOut))
+#define MTPluginByteSourceRead PAL::softLink_MediaToolbox_MTPluginByteSourceRead
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, MediaToolbox, MTPluginFormatReaderGetClassID, CMBaseClassID, (), ())
+#define MTPluginFormatReaderGetClassID PAL::softLink_MediaToolbox_MTPluginFormatReaderGetClassID
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, MediaToolbox, MTPluginFormatReaderGetTypeID, CFTypeID, (), ())
+#define MTPluginFormatReaderGetTypeID PAL::softLink_MediaToolbox_MTPluginFormatReaderGetTypeID
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, MediaToolbox, MTPluginFormatReaderDisableSandboxing, OSStatus, (), ())
+#define MTPluginFormatReaderDisableSandboxing PAL::softLink_MediaToolbox_MTPluginFormatReaderDisableSandboxing
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, MediaToolbox, MTRegisterPluginFormatReaderBundleDirectory, void, (CFURLRef directoryURL), (directoryURL))
+#define MTRegisterPluginFormatReaderBundleDirectory PAL::softLink_MediaToolbox_MTRegisterPluginFormatReaderBundleDirectory
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, MediaToolbox, MTPluginSampleCursorGetClassID, CMBaseClassID, (), ())
+#define MTPluginSampleCursorGetClassID PAL::softLink_MediaToolbox_MTPluginSampleCursorGetClassID
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, MediaToolbox, MTPluginSampleCursorGetTypeID, CFTypeID, (), ())
+#define MTPluginSampleCursorGetTypeID PAL::softLink_MediaToolbox_MTPluginSampleCursorGetTypeID
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, MediaToolbox, MTPluginTrackReaderGetClassID, CMBaseClassID, (), ())
+#define MTPluginTrackReaderGetClassID PAL::softLink_MediaToolbox_MTPluginTrackReaderGetClassID
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, MediaToolbox, MTPluginTrackReaderGetTypeID, CFTypeID, (), ())
+#define MTPluginTrackReaderGetTypeID PAL::softLink_MediaToolbox_MTPluginTrackReaderGetTypeID
#endif // HAVE(MT_PLUGIN_FORMAT_READER)
Modified: branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/cocoa/OpenGLSoftLinkCocoa.h (275776 => 275777)
--- branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/cocoa/OpenGLSoftLinkCocoa.h 2021-04-09 20:37:28 UTC (rev 275776)
+++ branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/cocoa/OpenGLSoftLinkCocoa.h 2021-04-09 20:37:32 UTC (rev 275777)
@@ -34,15 +34,26 @@
SOFT_LINK_FRAMEWORK_FOR_HEADER(PAL, OpenGL)
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLChoosePixelFormat, CGLError, (const CGLPixelFormatAttribute *attribs, CGLPixelFormatObj *pix, GLint *npix), (attribs, pix, npix))
+#define CGLChoosePixelFormat PAL::softLink_OpenGL_CGLChoosePixelFormat
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLCreateContext, CGLError, (CGLPixelFormatObj pix, CGLContextObj share, CGLContextObj *ctx), (pix, share, ctx))
+#define CGLCreateContext PAL::softLink_OpenGL_CGLCreateContext
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLDescribePixelFormat, CGLError, (CGLPixelFormatObj pix, GLint pix_num, CGLPixelFormatAttribute attrib, GLint *value), (pix, pix_num, attrib, value))
+#define CGLDescribePixelFormat PAL::softLink_OpenGL_CGLDescribePixelFormat
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLDescribeRenderer, CGLError, (CGLRendererInfoObj rend, GLint rend_num, CGLRendererProperty prop, GLint *value), (rend, rend_num, prop, value))
+#define CGLDescribeRenderer PAL::softLink_OpenGL_CGLDescribeRenderer
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLDestroyContext, CGLError, (CGLContextObj ctx), (ctx))
+#define CGLDestroyContext PAL::softLink_OpenGL_CGLDestroyContext
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLDestroyRendererInfo, CGLError, (CGLRendererInfoObj rend), (rend))
+#define CGLDestroyRendererInfo PAL::softLink_OpenGL_CGLDestroyRendererInfo
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLGetParameter, CGLError, (CGLContextObj ctx, CGLContextParameter pname, GLint *params), (ctx, pname, params))
+#define CGLGetParameter PAL::softLink_OpenGL_CGLGetParameter
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLQueryRendererInfo, CGLError, (GLuint display_mask, CGLRendererInfoObj *rend, GLint *nrend), (display_mask, rend, nrend))
+#define CGLQueryRendererInfo PAL::softLink_OpenGL_CGLQueryRendererInfo
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLReleasePixelFormat, void, (CGLPixelFormatObj pix), (pix))
+#define CGLReleasePixelFormat PAL::softLink_OpenGL_CGLReleasePixelFormat
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLSetVirtualScreen, CGLError, (CGLContextObj ctx, GLint screen), (ctx, screen))
+#define CGLSetVirtualScreen PAL::softLink_OpenGL_CGLSetVirtualScreen
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, OpenGL, CGLUpdateContext, CGLError, (CGLContextObj ctx), (ctx))
+#define CGLUpdateContext PAL::softLink_OpenGL_CGLUpdateContext
#endif
Modified: branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/cocoa/PassKitSoftLink.h (275776 => 275777)
--- branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/cocoa/PassKitSoftLink.h 2021-04-09 20:37:28 UTC (rev 275776)
+++ branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/cocoa/PassKitSoftLink.h 2021-04-09 20:37:32 UTC (rev 275777)
@@ -57,7 +57,9 @@
#endif
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, PassKit, PKCanMakePaymentsWithMerchantIdentifierAndDomain, void, (NSString *identifier, NSString *domain, PKCanMakePaymentsCompletion completion), (identifier, domain, completion))
+#define PKCanMakePaymentsWithMerchantIdentifierAndDomain PAL::softLink_PassKit_PKCanMakePaymentsWithMerchantIdentifierAndDomain
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, PassKit, PKDrawApplePayButtonWithCornerRadius, void, (CGContextRef context, CGRect drawRect, CGFloat scale, CGFloat cornerRadius, PKPaymentButtonType type, PKPaymentButtonStyle style, NSString *languageCode), (context, drawRect, scale, cornerRadius, type, style, languageCode))
+#define PKDrawApplePayButtonWithCornerRadius PAL::softLink_PassKit_PKDrawApplePayButtonWithCornerRadius
SOFT_LINK_CLASS_FOR_HEADER(PAL, PKPaymentAuthorizationResult)
@@ -77,6 +79,7 @@
SOFT_LINK_CONSTANT_FOR_HEADER(PAL, PassKit, PKPaymentErrorPostalAddressUserInfoKey, PKPaymentErrorKey)
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, PassKit, PKCanMakePaymentsWithMerchantIdentifierDomainAndSourceApplication, void, (NSString *identifier, NSString *domain, NSString *sourceApplicationSecondaryIdentifier, PKCanMakePaymentsCompletion completion), (identifier, domain, sourceApplicationSecondaryIdentifier, completion))
+#define PKCanMakePaymentsWithMerchantIdentifierDomainAndSourceApplication PAL::softLink_PassKit_PKCanMakePaymentsWithMerchantIdentifierDomainAndSourceApplication
#if USE(APPLE_INTERNAL_SDK)
#import <WebKitAdditions/PassKitSoftLinkAdditions.h>
Modified: branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/ios/UIKitSoftLink.h (275776 => 275777)
--- branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/ios/UIKitSoftLink.h 2021-04-09 20:37:28 UTC (rev 275776)
+++ branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/ios/UIKitSoftLink.h 2021-04-09 20:37:32 UTC (rev 275777)
@@ -63,14 +63,24 @@
SOFT_LINK_CLASS_FOR_HEADER(PAL, UIViewController)
SOFT_LINK_CLASS_FOR_HEADER(PAL, UIWindow)
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, UIKit, _UIKitGetTextEffectsCatalog, CUICatalog *, (void), ())
+#define _UIKitGetTextEffectsCatalog PAL::softLink_UIKit__UIKitGetTextEffectsCatalog
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, UIKit, UIAccessibilityIsGrayscaleEnabled, BOOL, (void), ())
+#define UIAccessibilityIsGrayscaleEnabled PAL::softLink_UIKit_UIAccessibilityIsGrayscaleEnabled
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, UIKit, UIAccessibilityIsInvertColorsEnabled, BOOL, (void), ())
+#define UIAccessibilityIsInvertColorsEnabled PAL::softLink_UIKit_UIAccessibilityIsInvertColorsEnabled
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, UIKit, UIAccessibilityIsReduceMotionEnabled, BOOL, (void), ())
+#define UIAccessibilityIsReduceMotionEnabled PAL::softLink_UIKit_UIAccessibilityIsReduceMotionEnabled
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, UIKit, UIAccessibilityDarkerSystemColorsEnabled, BOOL, (void), ())
+#define UIAccessibilityDarkerSystemColorsEnabled PAL::softLink_UIKit_UIAccessibilityDarkerSystemColorsEnabled
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, UIKit, UIAccessibilityPostNotification, void, (UIAccessibilityNotifications n, id argument), (n, argument))
+#define UIAccessibilityPostNotification PAL::softLink_UIKit_UIAccessibilityPostNotification
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, UIKit, UIGraphicsGetCurrentContext, CGContextRef, (void), ())
+#define UIGraphicsGetCurrentContext PAL::softLink_UIKit_UIGraphicsGetCurrentContext
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, UIKit, UIGraphicsPopContext, void, (void), ())
+#define UIGraphicsPopContext PAL::softLink_UIKit_UIGraphicsPopContext
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, UIKit, UIGraphicsPushContext, void, (CGContextRef context), (context))
+#define UIGraphicsPushContext PAL::softLink_UIKit_UIGraphicsPushContext
SOFT_LINK_FUNCTION_FOR_HEADER(PAL, UIKit, UIImagePNGRepresentation, NSData *, (UIImage *image), (image))
+#define UIImagePNGRepresentation PAL::softLink_UIKit_UIImagePNGRepresentation
#endif
Modified: branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/spi/cocoa/AccessibilitySupportSoftLink.cpp (275776 => 275777)
--- branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/spi/cocoa/AccessibilitySupportSoftLink.cpp 2021-04-09 20:37:28 UTC (rev 275776)
+++ branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/spi/cocoa/AccessibilitySupportSoftLink.cpp 2021-04-09 20:37:32 UTC (rev 275777)
@@ -24,10 +24,12 @@
*/
#import "config.h"
-#import "AccessibilitySupportSoftLink.h"
#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
+#include <pal/spi/cocoa/AccessibilitySupportSPI.h>
+#include <wtf/SoftLinking.h>
+
SOFT_LINK_LIBRARY_FOR_SOURCE(PAL, libAccessibility)
SOFT_LINK_FUNCTION_MAY_FAIL_FOR_SOURCE_WITH_EXPORT(PAL, libAccessibility, _AXSIsolatedTreeMode, AXSIsolatedTreeMode, (void), (), PAL_EXPORT)
Modified: branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/spi/cocoa/AccessibilitySupportSoftLink.h (275776 => 275777)
--- branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/spi/cocoa/AccessibilitySupportSoftLink.h 2021-04-09 20:37:28 UTC (rev 275776)
+++ branches/safari-612.1.10-branch/Source/WebCore/PAL/pal/spi/cocoa/AccessibilitySupportSoftLink.h 2021-04-09 20:37:32 UTC (rev 275777)
@@ -28,8 +28,6 @@
#include <pal/spi/cocoa/AccessibilitySupportSPI.h>
#include <wtf/SoftLinking.h>
-WTF_EXTERN_C_BEGIN
-
#if ENABLE(ACCESSIBILITY_ISOLATED_TREE)
SOFT_LINK_LIBRARY_FOR_HEADER(PAL, libAccessibility)
@@ -38,5 +36,3 @@
#define _AXSIsolatedTreeModeFunctionIsAvailable PAL::islibAccessibilityLibaryAvailable() && PAL::canLoad_libAccessibility__AXSIsolatedTreeMode
#endif // ENABLE(ACCESSIBILITY_ISOLATED_TREE)
-
-WTF_EXTERN_C_END
Modified: branches/safari-612.1.10-branch/Source/WebCore/xml/SoftLinkLibxslt.cpp (275776 => 275777)
--- branches/safari-612.1.10-branch/Source/WebCore/xml/SoftLinkLibxslt.cpp 2021-04-09 20:37:28 UTC (rev 275776)
+++ branches/safari-612.1.10-branch/Source/WebCore/xml/SoftLinkLibxslt.cpp 2021-04-09 20:37:32 UTC (rev 275777)
@@ -26,8 +26,16 @@
#include "config.h"
#if OS(DARWIN) && !PLATFORM(GTK)
-#include "SoftLinkLibxslt.h"
+#include <libxslt/documents.h>
+#include <libxslt/imports.h>
+#include <libxslt/security.h>
+#include <libxslt/templates.h>
+#include <libxslt/variables.h>
+#include <libxslt/xsltutils.h>
+
+#include <wtf/SoftLinking.h>
+
SOFT_LINK_LIBRARY_FOR_SOURCE(WebCore, libxslt)
SOFT_LINK_FUNCTION_FOR_SOURCE(WebCore, libxslt, xsltFreeStylesheet, void, (xsltStylesheetPtr sheet), (sheet))
Modified: branches/safari-612.1.10-branch/Source/WebCore/xml/SoftLinkLibxslt.h (275776 => 275777)
--- branches/safari-612.1.10-branch/Source/WebCore/xml/SoftLinkLibxslt.h 2021-04-09 20:37:28 UTC (rev 275776)
+++ branches/safari-612.1.10-branch/Source/WebCore/xml/SoftLinkLibxslt.h 2021-04-09 20:37:32 UTC (rev 275777)
@@ -22,12 +22,14 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#pragma once
+
#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 WebCore::softLink_libxslt_xsltFreeStylesheet
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltFreeTransformContext, void, (xsltTransformContextPtr ctxt), (ctxt))
+#define xsltFreeTransformContext WebCore::softLink_libxslt_xsltFreeTransformContext
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltNewTransformContext, xsltTransformContextPtr, (xsltStylesheetPtr style, xmlDocPtr doc), (style, doc))
+#define xsltNewTransformContext WebCore::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 WebCore::softLink_libxslt_xsltApplyStylesheetUser
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltQuoteUserParams, int, (xsltTransformContextPtr ctxt, const char** params), (ctxt, params))
+#define xsltQuoteUserParams WebCore::softLink_libxslt_xsltQuoteUserParams
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltSetCtxtSortFunc, void, (xsltTransformContextPtr ctxt, xsltSortFunc handler), (ctxt, handler))
+#define xsltSetCtxtSortFunc WebCore::softLink_libxslt_xsltSetCtxtSortFunc
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltSetLoaderFunc, void, (xsltDocLoaderFunc f), (f))
+#define xsltSetLoaderFunc WebCore::softLink_libxslt_xsltSetLoaderFunc
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltSaveResultTo, int, (xmlOutputBufferPtr buf, xmlDocPtr result, xsltStylesheetPtr style), (buf, result, style))
+#define xsltSaveResultTo WebCore::softLink_libxslt_xsltSaveResultTo
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltNextImport, xsltStylesheetPtr, (xsltStylesheetPtr style), (style))
+#define xsltNextImport WebCore::softLink_libxslt_xsltNextImport
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltNewSecurityPrefs, xsltSecurityPrefsPtr, (), ())
+#define xsltNewSecurityPrefs WebCore::softLink_libxslt_xsltNewSecurityPrefs
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltFreeSecurityPrefs, void, (xsltSecurityPrefsPtr sec), (sec))
+#define xsltFreeSecurityPrefs WebCore::softLink_libxslt_xsltFreeSecurityPrefs
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltSetSecurityPrefs, int, (xsltSecurityPrefsPtr sec, xsltSecurityOption option, xsltSecurityCheck func), (sec, option, func))
+#define xsltSetSecurityPrefs WebCore::softLink_libxslt_xsltSetSecurityPrefs
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltSetCtxtSecurityPrefs, int, (xsltSecurityPrefsPtr sec, xsltTransformContextPtr ctxt), (sec, ctxt))
+#define xsltSetCtxtSecurityPrefs WebCore::softLink_libxslt_xsltSetCtxtSecurityPrefs
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltSecurityForbid, int, (xsltSecurityPrefsPtr sec, xsltTransformContextPtr ctxt, const char* value), (sec, ctxt, value))
+#define xsltSecurityForbid WebCore::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 WebCore::softLink_libxslt_xsltGetNsProp
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltParseStylesheetDoc, xsltStylesheetPtr, (xmlDocPtr doc), (doc))
+#define xsltParseStylesheetDoc WebCore::softLink_libxslt_xsltParseStylesheetDoc
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltLoadStylesheetPI, xsltStylesheetPtr, (xmlDocPtr doc), (doc))
+#define xsltLoadStylesheetPI WebCore::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 WebCore::softLink_libxslt_xsltRegisterExtFunction
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltFunctionNodeSet, void, (xmlXPathParserContextPtr ctxt, int nargs), (ctxt, nargs))
+#define xsltFunctionNodeSet WebCore::softLink_libxslt_xsltFunctionNodeSet
SOFT_LINK_FUNCTION_FOR_HEADER(WebCore, libxslt, xsltComputeSortResult, xmlXPathObjectPtr*, (xsltTransformContextPtr ctxt, xmlNodePtr sort), (ctxt, sort))
+#define xsltComputeSortResult WebCore::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 WebCore::softLink_libxslt_xsltEvalAttrValueTemplate
SOFT_LINK_VARIABLE_FOR_HEADER(WebCore, libxslt, xsltMaxDepth, int);
#define xsltMaxDepth get_libxslt_xsltMaxDepth()
