Diff
Modified: trunk/Source/WTF/ChangeLog (240331 => 240332)
--- trunk/Source/WTF/ChangeLog 2019-01-23 11:32:55 UTC (rev 240331)
+++ trunk/Source/WTF/ChangeLog 2019-01-23 11:58:15 UTC (rev 240332)
@@ -1,3 +1,17 @@
+2019-01-23 David Kilzer <ddkil...@apple.com>
+
+ Switch remaining CoreMedia soft-linking in WebKit over to CoreMediaSoftLink.{cpp,h}
+ <https://webkit.org/b/193694>
+ <rdar://problem/47464025>
+
+ Reviewed by Tim Horton.
+
+ * wtf/win/SoftLinking.h:
+ (SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT):
+ - Implement for Windows.
+ (SOFT_LINK_CONSTANT_FOR_SOURCE):
+ - Define using SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT().
+
2019-01-22 Tadeu Zagallo <tzaga...@apple.com>
Cache bytecode to disk
Modified: trunk/Source/WTF/wtf/win/SoftLinking.h (240331 => 240332)
--- trunk/Source/WTF/wtf/win/SoftLinking.h 2019-01-23 11:32:55 UTC (rev 240331)
+++ trunk/Source/WTF/wtf/win/SoftLinking.h 2019-01-23 11:58:15 UTC (rev 240332)
@@ -192,7 +192,7 @@
variableType get_##framework##_##variableName(); \
}
-#define SOFT_LINK_CONSTANT_FOR_SOURCE(functionNamespace, framework, variableName, variableType) \
+#define SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(functionNamespace, framework, variableName, variableType, export) \
namespace functionNamespace { \
static void init##framework##variableName(void* context) { \
variableType* ptr = reinterpret_cast<variableType*>(SOFT_LINK_GETPROCADDRESS(framework##Library(), #variableName)); \
@@ -199,7 +199,7 @@
RELEASE_ASSERT(ptr); \
*static_cast<variableType*>(context) = *ptr; \
} \
- variableType get_##framework##_##variableName(); \
+ export variableType get_##framework##_##variableName(); \
variableType get_##framework##_##variableName() \
{ \
static variableType constant##framework##variableName; \
@@ -209,6 +209,9 @@
} \
}
+#define SOFT_LINK_CONSTANT_FOR_SOURCE(functionNamespace, framework, variableName, variableType) \
+ SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(functionNamespace, framework, variableName, variableType, )
+
#define SOFT_LINK_CONSTANT_MAY_FAIL_FOR_HEADER(functionNamespace, framework, variableName, variableType) \
namespace functionNamespace { \
bool canLoad_##framework##_##variableName(); \
Modified: trunk/Source/WebCore/PAL/ChangeLog (240331 => 240332)
--- trunk/Source/WebCore/PAL/ChangeLog 2019-01-23 11:32:55 UTC (rev 240331)
+++ trunk/Source/WebCore/PAL/ChangeLog 2019-01-23 11:58:15 UTC (rev 240332)
@@ -1,3 +1,17 @@
+2019-01-23 David Kilzer <ddkil...@apple.com>
+
+ Switch remaining CoreMedia soft-linking in WebKit over to CoreMediaSoftLink.{cpp,h}
+ <https://webkit.org/b/193694>
+ <rdar://problem/47464025>
+
+ Reviewed by Tim Horton.
+
+ * pal/cf/CoreMediaSoftLink.cpp:
+ - Export kCMTimeZero soft-link.
+ * pal/cf/CoreMediaSoftLink.h:
+ - Update kCMTimeZero macro to use PAL namespace for use in
+ WebKit.framework.
+
2019-01-22 David Kilzer <ddkil...@apple.com>
Switch remaining QuickLook soft-linking in WebCore, WebKit over to QuickLookSoftLink.{cpp,h}
Modified: trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp (240331 => 240332)
--- trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp 2019-01-23 11:32:55 UTC (rev 240331)
+++ trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp 2019-01-23 11:58:15 UTC (rev 240332)
@@ -83,7 +83,7 @@
SOFT_LINK_CONSTANT_FOR_SOURCE(PAL, CoreMedia, kCMTextVerticalLayout_LeftToRight, CFStringRef)
SOFT_LINK_CONSTANT_FOR_SOURCE(PAL, CoreMedia, kCMTextVerticalLayout_RightToLeft, CFStringRef)
SOFT_LINK_CONSTANT_FOR_SOURCE(PAL, CoreMedia, kCMTimeInvalid, CMTime)
-SOFT_LINK_CONSTANT_FOR_SOURCE(PAL, CoreMedia, kCMTimeZero, CMTime)
+SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, CoreMedia, kCMTimeZero, CMTime, PAL_EXPORT)
SOFT_LINK_CONSTANT_FOR_SOURCE(PAL, CoreMedia, kCMTimePositiveInfinity, CMTime)
SOFT_LINK_CONSTANT_FOR_SOURCE(PAL, CoreMedia, kCMTimeRangeInvalid, CMTimeRange);
Modified: trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h (240331 => 240332)
--- trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2019-01-23 11:32:55 UTC (rev 240331)
+++ trunk/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h 2019-01-23 11:58:15 UTC (rev 240332)
@@ -125,7 +125,7 @@
SOFT_LINK_CONSTANT_FOR_HEADER(PAL, CoreMedia, kCMTimeInvalid, CMTime)
#define kCMTimeInvalid get_CoreMedia_kCMTimeInvalid()
SOFT_LINK_CONSTANT_FOR_HEADER(PAL, CoreMedia, kCMTimeZero, CMTime)
-#define kCMTimeZero get_CoreMedia_kCMTimeZero()
+#define kCMTimeZero PAL::get_CoreMedia_kCMTimeZero()
SOFT_LINK_CONSTANT_FOR_HEADER(PAL, CoreMedia, kCMTimePositiveInfinity, CMTime)
#define kCMTimePositiveInfinity get_CoreMedia_kCMTimePositiveInfinity()
SOFT_LINK_CONSTANT_FOR_HEADER(PAL, CoreMedia, kCMTimeRangeInvalid, CMTimeRange);
Modified: trunk/Source/WebKit/ChangeLog (240331 => 240332)
--- trunk/Source/WebKit/ChangeLog 2019-01-23 11:32:55 UTC (rev 240331)
+++ trunk/Source/WebKit/ChangeLog 2019-01-23 11:58:15 UTC (rev 240332)
@@ -1,3 +1,14 @@
+2019-01-23 David Kilzer <ddkil...@apple.com>
+
+ Switch remaining CoreMedia soft-linking in WebKit over to CoreMediaSoftLink.{cpp,h}
+ <https://webkit.org/b/193694>
+ <rdar://problem/47464025>
+
+ Reviewed by Tim Horton.
+
+ * Shared/ios/WebIconUtilities.mm:
+ - Switch to using CoreMediaSoftLink.{h,mm} in PAL.
+
2019-01-22 Chris Dumez <cdu...@apple.com>
Regression(r240178) Some API tests are crashing
Modified: trunk/Source/WebKit/Shared/ios/WebIconUtilities.mm (240331 => 240332)
--- trunk/Source/WebKit/Shared/ios/WebIconUtilities.mm 2019-01-23 11:32:55 UTC (rev 240331)
+++ trunk/Source/WebKit/Shared/ios/WebIconUtilities.mm 2019-01-23 11:58:15 UTC (rev 240332)
@@ -34,6 +34,7 @@
#import <CoreMedia/CoreMedia.h>
#import <ImageIO/ImageIO.h>
#import <MobileCoreServices/MobileCoreServices.h>
+#import <pal/cf/CoreMediaSoftLink.h>
#import <wtf/MathExtras.h>
#import <wtf/RetainPtr.h>
#import <wtf/SoftLinking.h>
@@ -42,11 +43,6 @@
SOFT_LINK_CLASS(AVFoundation, AVAssetImageGenerator);
SOFT_LINK_CLASS(AVFoundation, AVURLAsset);
-SOFT_LINK_FRAMEWORK(CoreMedia);
-SOFT_LINK_CONSTANT(CoreMedia, kCMTimeZero, CMTime);
-
-#define kCMTimeZero getkCMTimeZero()
-
namespace WebKit {
static const CGFloat iconSideLength = 100;
