Attachment 359798 Details for Bug 193694 – Patch v1

[patch] Patch v1

bug-193694-20190122160921.patch (text/plain), 4.38 KB, created by David Kilzer (:ddkilzer) on 2019-01-22 16:09:22 PST

(hide)

Description:

Filename:

MIME Type:

Creator: David Kilzer (:ddkilzer)

Created: 2019-01-22 16:09:22 PST

Size: 4.38 KB

patch

obsolete

>Subversion Revision: 240275
>diff --git a/Source/WebCore/PAL/ChangeLog b/Source/WebCore/PAL/ChangeLog
>index 39d84cfb72b4e425bd973c97b46889af5aad5925..2ec2ff82c187d6b14e628d68d56517a83f2cba52 100644
>--- a/Source/WebCore/PAL/ChangeLog
>+++ b/Source/WebCore/PAL/ChangeLog
>@@ -1,3 +1,17 @@
>+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 NOBODY (OOPS!).
>+
>+        * 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..a9cca8770d637a577d89bd533025a60b54923af2 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/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 NOBODY (OOPS!).
>+
>+        * 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/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;

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193694: 359798 | 359845 | 359861