WebKit Bugzilla
Attachment 359861 Details for
Bug 193694
: Switch remaining CoreMedia soft-linking in WebKit over to CoreMediaSoftLink.{cpp,h}
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch v3 (test Windows build fix)
bug-193694-20190123020506.patch (text/plain), 6.70 KB, created by
David Kilzer (:ddkilzer)
on 2019-01-23 02:05:07 PST
(
hide
)
Description:
Patch v3 (test Windows build fix)
Filename:
MIME Type:
Creator:
David Kilzer (:ddkilzer)
Created:
2019-01-23 02:05:07 PST
Size:
6.70 KB
patch
obsolete
>Subversion Revision: 240275 >diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog >index 17b2f9dfcaf4360bf9fe246d48fadbcf522a50f7..b5e182675be1a52e201bf19e74b36b27145540e9 100644 >--- a/Source/WTF/ChangeLog >+++ b/Source/WTF/ChangeLog >@@ -1,3 +1,17 @@ >+2019-01-23 David Kilzer <ddkilzer@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 <tzagallo@apple.com> > > Cache bytecode to disk >diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog >index 39d84cfb72b4e425bd973c97b46889af5aad5925..1d64dcb097b0a6703263e4904eb481020b995742 100644 >--- a/Source/WebCore/PAL/ChangeLog >+++ b/Source/WebCore/PAL/ChangeLog >@@ -1,3 +1,17 @@ >+2019-01-23 David Kilzer <ddkilzer@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 <ddkilzer@apple.com> > > Switch remaining QuickLook soft-linking in WebCore, WebKit over to QuickLookSoftLink.{cpp,h} >diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog >index adb745dea1ed193693486b7b4f503c0c0c21fe2d..25f0f5b7e8cfb8c89e8f6c70cd20332fbf890988 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,14 @@ >+2019-01-23 David Kilzer <ddkilzer@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 David Kilzer <ddkilzer@apple.com> > > C strings in ClientCertificateAuthenticationXPCConstants.h are duplicated >diff --git a/Source/WTF/wtf/win/SoftLinking.h b/Source/WTF/wtf/win/SoftLinking.h >index 442932a21a132d1c4b99a3b8778e5dfa632e7e58..a6814cfff666710098f7d81b5d13b52e3c05c5e7 100644 >--- a/Source/WTF/wtf/win/SoftLinking.h >+++ b/Source/WTF/wtf/win/SoftLinking.h >@@ -192,14 +192,14 @@ > 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)); \ > 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(); \ >diff --git a/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp b/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp >index c127bf32074cc3359c36e40d7b353d2e9f479241..2b8231365cb9aaf93597f187fa22c149be42fb3a 100644 >--- a/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp >+++ b/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp >@@ -83,7 +83,7 @@ SOFT_LINK_CONSTANT_FOR_SOURCE(PAL, CoreMedia, kCMTextMarkupAttribute_WritingDire > 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); > >diff --git a/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h b/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h >index c9510495e69834bda30ab489d2ecabb5b81a8c12..268d167f27d6d3abbff5935267fc222391010e3d 100644 >--- a/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h >+++ b/Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h >@@ -125,7 +125,7 @@ SOFT_LINK_CONSTANT_FOR_HEADER(PAL, CoreMedia, kCMTextVerticalLayout_RightToLeft, > 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); >diff --git a/Source/WebKit/Shared/ios/WebIconUtilities.mm b/Source/WebKit/Shared/ios/WebIconUtilities.mm >index 3670580880cfed1dd848bc3e98e3eef8ec9f826a..470eca4567a0329273b3bf5c98b7dfd2da627416 100644 >--- a/Source/WebKit/Shared/ios/WebIconUtilities.mm >+++ b/Source/WebKit/Shared/ios/WebIconUtilities.mm >@@ -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_FRAMEWORK(AVFoundation); > 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;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 193694
:
359798
|
359845
| 359861