[webkit-changes] [254476] branches/safari-609-branch/Source/WebCore/PAL

Mon, 13 Jan 2020 17:10:53 -0800

Title: [254476] branches/safari-609-branch/Source/WebCore/PAL
Revision
254476
Author
[email protected]
Date
2020-01-13 17:10:10 -0800 (Mon, 13 Jan 2020)

Log Message

Cherry-pick r254257. rdar://problem/58530962

    Don't softlink AVCapture classes on watchOS or tvOS
    https://bugs.webkit.org/show_bug.cgi?id=205974
    <rdar://problem/45508044>

    Reviewed by Jon Lee.

    * pal/cocoa/AVFoundationSoftLink.h:
    * pal/cocoa/AVFoundationSoftLink.mm:

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254257 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-609-branch/Source/WebCore/PAL/ChangeLog (254475 => 254476)


--- branches/safari-609-branch/Source/WebCore/PAL/ChangeLog	2020-01-14 01:10:07 UTC (rev 254475)
+++ branches/safari-609-branch/Source/WebCore/PAL/ChangeLog	2020-01-14 01:10:10 UTC (rev 254476)
@@ -1,3 +1,30 @@
+2020-01-13  Alan Coon  <[email protected]>
+
+        Cherry-pick r254257. rdar://problem/58530962
+
+    Don't softlink AVCapture classes on watchOS or tvOS
+    https://bugs.webkit.org/show_bug.cgi?id=205974
+    <rdar://problem/45508044>
+    
+    Reviewed by Jon Lee.
+    
+    * pal/cocoa/AVFoundationSoftLink.h:
+    * pal/cocoa/AVFoundationSoftLink.mm:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254257 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-01-09  Eric Carlson  <[email protected]>
+
+            Don't softlink AVCapture classes on watchOS or tvOS
+            https://bugs.webkit.org/show_bug.cgi?id=205974
+            <rdar://problem/45508044>
+
+            Reviewed by Jon Lee.
+
+            * pal/cocoa/AVFoundationSoftLink.h:
+            * pal/cocoa/AVFoundationSoftLink.mm:
+
 2019-12-20  Alex Christensen  <[email protected]>
 
         Allow a managed configuration to re-enable TLS 1.0 and 1.1

Modified: branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h (254475 => 254476)


--- branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h	2020-01-14 01:10:07 UTC (rev 254475)
+++ branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h	2020-01-14 01:10:10 UTC (rev 254476)
@@ -43,17 +43,9 @@
 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVAssetResourceLoadingRequest)
 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVAssetWriter)
 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVAssetWriterInput)
-SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureConnection)
-SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureDevice)
-SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureDeviceFormat)
-SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureDeviceInput)
-SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureOutput)
-SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureSession)
-SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureVideoDataOutput)
 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVContentKeyReportGroup)
 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVContentKeyResponse)
 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVContentKeySession)
-SOFT_LINK_CLASS_FOR_HEADER(PAL, AVFrameRateRange)
 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVMediaSelectionGroup)
 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVMediaSelectionOption)
 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVMetadataItem)
@@ -90,6 +82,17 @@
 SOFT_LINK_CLASS_FOR_HEADER(PAL, AVVideoPerformanceMetrics)
 #endif
 
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureConnection)
+SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureDevice)
+SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureDeviceFormat)
+SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureDeviceInput)
+SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureOutput)
+SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureSession)
+SOFT_LINK_CLASS_FOR_HEADER(PAL, AVCaptureVideoDataOutput)
+SOFT_LINK_CLASS_FOR_HEADER(PAL, AVFrameRateRange)
+#endif
+
 SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVAudioTimePitchAlgorithmSpectral, NSString *)
 #define AVAudioTimePitchAlgorithmSpectral PAL::get_AVFoundation_AVAudioTimePitchAlgorithmSpectral()
 SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVAudioTimePitchAlgorithmVarispeed, NSString *)

Modified: branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm (254475 => 254476)


--- branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm	2020-01-14 01:10:07 UTC (rev 254475)
+++ branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm	2020-01-14 01:10:10 UTC (rev 254476)
@@ -37,14 +37,6 @@
 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAssetReader, PAL_EXPORT)
 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAssetWriter, PAL_EXPORT)
 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAssetWriterInput, PAL_EXPORT)
-SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureConnection, PAL_EXPORT)
-SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureDevice, PAL_EXPORT)
-SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureDeviceFormat, PAL_EXPORT)
-SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureDeviceInput, PAL_EXPORT)
-SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureOutput, PAL_EXPORT)
-SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureSession, PAL_EXPORT)
-SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureVideoDataOutput, PAL_EXPORT)
-SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVFrameRateRange, PAL_EXPORT)
 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVMediaSelectionGroup, PAL_EXPORT)
 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVMediaSelectionOption, PAL_EXPORT)
 SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVMetadataItem, PAL_EXPORT)
@@ -86,6 +78,17 @@
 SOFT_LINK_CLASS_FOR_SOURCE_OPTIONAL_WITH_EXPORT(PAL, AVFoundation, AVVideoPerformanceMetrics, PAL_EXPORT)
 #endif
 
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureConnection, PAL_EXPORT)
+SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureDevice, PAL_EXPORT)
+SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureDeviceFormat, PAL_EXPORT)
+SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureDeviceInput, PAL_EXPORT)
+SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureOutput, PAL_EXPORT)
+SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureSession, PAL_EXPORT)
+SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVCaptureVideoDataOutput, PAL_EXPORT)
+SOFT_LINK_CLASS_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVFrameRateRange, PAL_EXPORT)
+#endif
+
 SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAssetImageGeneratorApertureModeCleanAperture, NSString *, PAL_EXPORT)
 SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAudioTimePitchAlgorithmSpectral, NSString *, PAL_EXPORT)
 SOFT_LINK_CONSTANT_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVAudioTimePitchAlgorithmVarispeed, NSString *, PAL_EXPORT)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to