Title: [254478] branches/safari-609-branch/Tools
- Revision
- 254478
- Author
- [email protected]
- Date
- 2020-01-13 17:10:16 -0800 (Mon, 13 Jan 2020)
Log Message
Cherry-pick r254440. rdar://problem/58530962
Don't softlink AVCapture classes on watchOS or tvOS
https://bugs.webkit.org/show_bug.cgi?id=205974
<rdar://problem/58427281>
Unreviewed test fix after r254257.
* TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm:
(TestWebKitAPI::TEST):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254440 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Tools/ChangeLog (254477 => 254478)
--- branches/safari-609-branch/Tools/ChangeLog 2020-01-14 01:10:13 UTC (rev 254477)
+++ branches/safari-609-branch/Tools/ChangeLog 2020-01-14 01:10:16 UTC (rev 254478)
@@ -1,3 +1,31 @@
+2020-01-13 Alan Coon <[email protected]>
+
+ Cherry-pick r254440. rdar://problem/58530962
+
+ Don't softlink AVCapture classes on watchOS or tvOS
+ https://bugs.webkit.org/show_bug.cgi?id=205974
+ <rdar://problem/58427281>
+
+ Unreviewed test fix after r254257.
+
+
+ * TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm:
+ (TestWebKitAPI::TEST):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254440 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-13 Eric Carlson <[email protected]>
+
+ Don't softlink AVCapture classes on watchOS or tvOS
+ https://bugs.webkit.org/show_bug.cgi?id=205974
+ <rdar://problem/58427281>
+
+ Unreviewed test fix after r254257.
+
+ * TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm:
+ (TestWebKitAPI::TEST):
+
2020-01-03 Tim Horton <[email protected]>
REGRESSION: 150+ flaky failures on some bots (color mismatches)
Modified: branches/safari-609-branch/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm (254477 => 254478)
--- branches/safari-609-branch/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm 2020-01-14 01:10:13 UTC (rev 254477)
+++ branches/safari-609-branch/Tools/TestWebKitAPI/Tests/WebCore/cocoa/AVFoundationSoftLinkTest.mm 2020-01-14 01:10:16 UTC (rev 254478)
@@ -48,16 +48,19 @@
EXPECT_NE(PAL::getAVAssetReaderClass(), nullptr);
EXPECT_NE(PAL::getAVAssetWriterClass(), nullptr);
EXPECT_NE(PAL::getAVAssetWriterInputClass(), nullptr);
- EXPECT_NE(PAL::getAVCaptureSessionClass(), nullptr);
+ EXPECT_NE(PAL::getAVMutableAudioMixClass(), nullptr);
+ EXPECT_NE(PAL::getAVMutableAudioMixInputParametersClass(), nullptr);
+
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
EXPECT_NE(PAL::getAVCaptureConnectionClass(), nullptr);
EXPECT_NE(PAL::getAVCaptureDeviceClass(), nullptr);
EXPECT_NE(PAL::getAVCaptureDeviceFormatClass(), nullptr);
EXPECT_NE(PAL::getAVCaptureDeviceInputClass(), nullptr);
EXPECT_NE(PAL::getAVCaptureOutputClass(), nullptr);
+ EXPECT_NE(PAL::getAVCaptureSessionClass(), nullptr);
EXPECT_NE(PAL::getAVCaptureVideoDataOutputClass(), nullptr);
EXPECT_NE(PAL::getAVFrameRateRangeClass(), nullptr);
- EXPECT_NE(PAL::getAVMutableAudioMixClass(), nullptr);
- EXPECT_NE(PAL::getAVMutableAudioMixInputParametersClass(), nullptr);
+#endif
#if HAVE(AVSTREAMSESSION) && ENABLE(LEGACY_ENCRYPTED_MEDIA)
EXPECT_NE(PAL::getAVStreamSessionClass(), nullptr);
@@ -170,11 +173,6 @@
#if PLATFORM(IOS_FAMILY)
EXPECT_TRUE([AVURLAssetBoundNetworkInterfaceName isEqualToString:@"AVURLAssetBoundNetworkInterfaceName"]);
EXPECT_TRUE([AVURLAssetClientBundleIdentifierKey isEqualToString:@"AVURLAssetClientBundleIdentifierKey"]);
- EXPECT_TRUE([AVCaptureSessionRuntimeErrorNotification isEqualToString:@"AVCaptureSessionRuntimeErrorNotification"]);
- EXPECT_TRUE([AVCaptureSessionWasInterruptedNotification isEqualToString:@"AVCaptureSessionWasInterruptedNotification"]);
- EXPECT_TRUE([AVCaptureSessionInterruptionEndedNotification isEqualToString:@"AVCaptureSessionInterruptionEndedNotification"]);
- EXPECT_TRUE([AVCaptureSessionInterruptionReasonKey isEqualToString:@"AVCaptureSessionInterruptionReasonKey"]);
- EXPECT_TRUE([AVCaptureSessionErrorKey isEqualToString:@"AVCaptureSessionErrorKey"]);
EXPECT_TRUE([AVAudioSessionCategoryAmbient isEqualToString:@"AVAudioSessionCategoryAmbient"]);
EXPECT_TRUE([AVAudioSessionCategorySoloAmbient isEqualToString:@"AVAudioSessionCategorySoloAmbient"]);
EXPECT_TRUE([AVAudioSessionCategoryPlayback isEqualToString:@"AVAudioSessionCategoryPlayback"]);
@@ -187,7 +185,15 @@
EXPECT_TRUE([AVAudioSessionInterruptionTypeKey isEqualToString:@"AVAudioSessionInterruptionTypeKey"]);
EXPECT_TRUE([AVAudioSessionInterruptionOptionKey isEqualToString:@"AVAudioSessionInterruptionOptionKey"]);
EXPECT_TRUE([AVRouteDetectorMultipleRoutesDetectedDidChangeNotification isEqualToString:@"AVRouteDetectorMultipleRoutesDetectedDidChangeNotification"]);
+#if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+ EXPECT_TRUE([AVCaptureSessionErrorKey isEqualToString:@"AVCaptureSessionErrorKey"]);
+ EXPECT_TRUE([AVCaptureSessionRuntimeErrorNotification isEqualToString:@"AVCaptureSessionRuntimeErrorNotification"]);
+ EXPECT_TRUE([AVCaptureSessionWasInterruptedNotification isEqualToString:@"AVCaptureSessionWasInterruptedNotification"]);
+ EXPECT_TRUE([AVCaptureSessionInterruptionEndedNotification isEqualToString:@"AVCaptureSessionInterruptionEndedNotification"]);
+ EXPECT_TRUE([AVCaptureSessionInterruptionReasonKey isEqualToString:@"AVCaptureSessionInterruptionReasonKey"]);
#endif
+
+#endif
}
#endif // PLATFORM(COCOA)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
