Attachment 343830 Details for Bug 187024 – Patch

[patch] Patch

bug-187024-20180628120538.patch (text/plain), 3.73 KB, created by Jonathan Bedard on 2018-06-28 12:05:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2018-06-28 12:05:39 PDT

Size: 3.73 KB

patch

obsolete

>Index: Source/WebCore/PAL/ChangeLog
>===================================================================
>--- Source/WebCore/PAL/ChangeLog	(revision 233314)
>+++ Source/WebCore/PAL/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2018-06-28  Jonathan Bedard  <jbedard@apple.com>
>+
>+        Build fix (2) after r233266 
>+        https://bugs.webkit.org/show_bug.cgi?id=187024
>+        <rdar://problem/39759057>
>+
>+        Unreviewed build fix.
>+
>+        * pal/cf/CoreMediaSoftLink.cpp: Distinguish between IOS and MINIMAL_SIMULATOR.
>+        * pal/cf/CoreMediaSoftLink.h: Ditto.
>+        * pal/spi/cocoa/LaunchServicesSPI.h: LSApplicationProxy should be conditionalized on HAVE(APP_LINKS).
>+
> 2018-06-27  Jonathan Bedard  <jbedard@apple.com>
> 
>         Build fix after r233266 
>Index: Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp
>===================================================================
>--- Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp	(revision 233304)
>+++ Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.cpp	(working copy)
>@@ -159,7 +159,7 @@ SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreM
> SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMClockGetHostTimeClock, CMClockRef, (void), ())
> SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMClockGetTime, CMTime, (CMClockRef clock), (clock))
> 
>-#if PLATFORM(APPLETV) || PLATFORM(MAC) || PLATFORM(WATCHOS) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000)
>+#if PLATFORM(APPLETV) || PLATFORM(MAC) || ENABLE(MINIMAL_SIMULATOR) || PLATFORM(WATCHOS) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000)
> SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMSampleBufferCallForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (* CMSAMPLEBUFFERCALL_NOESCAPE callback)( CMSampleBufferRef sampleBuffer, CMItemCount index, void *refcon), void *refcon), (sbuf, callback, refcon))
> SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, CoreMedia, CMSampleBufferCallBlockForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (^ CMSAMPLEBUFFERCALL_NOESCAPE handler)(CMSampleBufferRef, CMItemCount)), (sbuf, handler))
> #endif
>Index: Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h
>===================================================================
>--- Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h	(revision 233304)
>+++ Source/WebCore/PAL/pal/cf/CoreMediaSoftLink.h	(working copy)
>@@ -268,7 +268,7 @@ SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreM
> SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMClockGetTime, CMTime, (CMClockRef clock), (clock))
> #define CMClockGetTime  softLink_CoreMedia_CMClockGetTime
> 
>-#if PLATFORM(APPLETV) || PLATFORM(MAC) || PLATFORM(WATCHOS) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000)
>+#if PLATFORM(APPLETV) || PLATFORM(MAC) || ENABLE(MINIMAL_SIMULATOR) || PLATFORM(WATCHOS) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED < 120000)
> 
> SOFT_LINK_FUNCTION_FOR_HEADER(PAL, CoreMedia, CMSampleBufferCallForEachSample, OSStatus, (CMSampleBufferRef sbuf, OSStatus (* CMSAMPLEBUFFERCALL_NOESCAPE callback)( CMSampleBufferRef sampleBuffer, CMItemCount index, void *refcon), void *refcon), (sbuf, callback, refcon))
> #define CMSampleBufferCallForEachSample softLink_CoreMedia_CMSampleBufferCallForEachSample
>Index: Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h
>===================================================================
>--- Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h	(revision 233304)
>+++ Source/WebCore/PAL/pal/spi/cocoa/LaunchServicesSPI.h	(working copy)
>@@ -51,11 +51,11 @@ typedef void (^LSAppLinkOpenCompletionHa
> @interface LSBundleProxy : LSResourceProxy <NSSecureCoding>
> @end
> 
>+#if HAVE(APP_LINKS)
> @interface LSApplicationProxy : LSBundleProxy <NSSecureCoding>
> - (NSString *)localizedNameForContext:(NSString *)context;
> @end
> 
>-#if HAVE(APP_LINKS)
> @interface LSAppLink : NSObject <NSSecureCoding>
> @end
>

Actions: View | Formatted Diff | Diff

Attachments on bug 187024: 343561 | 343626 | 343637 | 343663 | 343759 | 343830