WebKit Bugzilla
Attachment 359845 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 v2 (for landing)
bug-193694-20190122205204.patch (text/plain), 3.95 KB, created by
David Kilzer (:ddkilzer)
on 2019-01-22 20:52:05 PST
(
hide
)
Description:
Patch v2 (for landing)
Filename:
MIME Type:
Creator:
David Kilzer (:ddkilzer)
Created:
2019-01-22 20:52:05 PST
Size:
3.95 KB
patch
obsolete
>Subversion Revision: 240275 >diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog >index 39d84cfb72b4e425bd973c97b46889af5aad5925..b1226e4253f9a1c6cad39585e9ec20fc8f11bde3 100644 >--- a/Source/WebCore/PAL/ChangeLog >+++ b/Source/WebCore/PAL/ChangeLog >@@ -1,3 +1,14 @@ >+2019-01-22 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. >+ > 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..c1375395f2d5ab1f2928289849071435f6697a37 100644 >--- a/Source/WebKit/ChangeLog >+++ b/Source/WebKit/ChangeLog >@@ -1,3 +1,16 @@ >+2019-01-22 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. >+ (WebKit::iconForVideoFile): >+ - Call soft-link function for kCMTimeZero directly. >+ > 2019-01-22 David Kilzer <ddkilzer@apple.com> > > C strings in ClientCertificateAuthenticationXPCConstants.h are duplicated >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/WebKit/Shared/ios/WebIconUtilities.mm b/Source/WebKit/Shared/ios/WebIconUtilities.mm >index 3670580880cfed1dd848bc3e98e3eef8ec9f826a..45dae7eefd2324e03f4706fd4a3e1685f3a31034 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; >@@ -129,7 +125,7 @@ UIImage* iconForVideoFile(NSURL *file) > [generator setAppliesPreferredTrackTransform:YES]; > > NSError *error = nil; >- RetainPtr<CGImageRef> imageRef = adoptCF([generator copyCGImageAtTime:kCMTimeZero actualTime:nil error:&error]); >+ RetainPtr<CGImageRef> imageRef = adoptCF([generator copyCGImageAtTime:PAL::get_CoreMedia_kCMTimeZero() actualTime:nil error:&error]); > if (!imageRef) { > LOG_ERROR("Error creating image for video '%@': %@", file, error); > return fallbackIconForFile(file);
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