Title: [259692] branches/safari-609-branch/Source/WebCore
- Revision
- 259692
- Author
- alanc...@apple.com
- Date
- 2020-04-07 17:32:39 -0700 (Tue, 07 Apr 2020)
Log Message
Cherry-pick r259388. rdar://problem/61269730
[iOS] Allow WebKit to use camera in multi-tasking mode
https://bugs.webkit.org/show_bug.cgi?id=209904
Reviewed by Youenn Fablet.
Source/WebCore:
* platform/mediastream/mac/AVVideoCaptureSource.mm:
(WebCore::AVVideoCaptureSource::setupSession):
Source/WebCore/PAL:
* pal/cocoa/AVFoundationSoftLink.h:
* pal/cocoa/AVFoundationSoftLink.mm:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259388 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-609-branch/Source/WebCore/ChangeLog (259691 => 259692)
--- branches/safari-609-branch/Source/WebCore/ChangeLog 2020-04-08 00:32:35 UTC (rev 259691)
+++ branches/safari-609-branch/Source/WebCore/ChangeLog 2020-04-08 00:32:39 UTC (rev 259692)
@@ -1,5 +1,36 @@
2020-04-07 Russell Epstein <repst...@apple.com>
+ Cherry-pick r259388. rdar://problem/61269730
+
+ [iOS] Allow WebKit to use camera in multi-tasking mode
+ https://bugs.webkit.org/show_bug.cgi?id=209904
+
+ Reviewed by Youenn Fablet.
+
+ Source/WebCore:
+
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ (WebCore::AVVideoCaptureSource::setupSession):
+
+ Source/WebCore/PAL:
+
+ * pal/cocoa/AVFoundationSoftLink.h:
+ * pal/cocoa/AVFoundationSoftLink.mm:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259388 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-02 Eric Carlson <eric.carl...@apple.com>
+
+ [iOS] Allow WebKit to use camera in multi-tasking mode
+ https://bugs.webkit.org/show_bug.cgi?id=209904
+
+ Reviewed by Youenn Fablet.
+
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ (WebCore::AVVideoCaptureSource::setupSession):
+
+2020-04-07 Russell Epstein <repst...@apple.com>
+
Cherry-pick r259363. rdar://problem/61269736
CRASH in MediaPlayerPrivateMediaSourceAVFObjC::addAudioRenderer(), uncaught ObjC exception
Modified: branches/safari-609-branch/Source/WebCore/PAL/ChangeLog (259691 => 259692)
--- branches/safari-609-branch/Source/WebCore/PAL/ChangeLog 2020-04-08 00:32:35 UTC (rev 259691)
+++ branches/safari-609-branch/Source/WebCore/PAL/ChangeLog 2020-04-08 00:32:39 UTC (rev 259692)
@@ -1,3 +1,34 @@
+2020-04-07 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r259388. rdar://problem/61269730
+
+ [iOS] Allow WebKit to use camera in multi-tasking mode
+ https://bugs.webkit.org/show_bug.cgi?id=209904
+
+ Reviewed by Youenn Fablet.
+
+ Source/WebCore:
+
+ * platform/mediastream/mac/AVVideoCaptureSource.mm:
+ (WebCore::AVVideoCaptureSource::setupSession):
+
+ Source/WebCore/PAL:
+
+ * pal/cocoa/AVFoundationSoftLink.h:
+ * pal/cocoa/AVFoundationSoftLink.mm:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259388 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-04-02 Eric Carlson <eric.carl...@apple.com>
+
+ [iOS] Allow WebKit to use camera in multi-tasking mode
+ https://bugs.webkit.org/show_bug.cgi?id=209904
+
+ Reviewed by Youenn Fablet.
+
+ * pal/cocoa/AVFoundationSoftLink.h:
+ * pal/cocoa/AVFoundationSoftLink.mm:
+
2020-02-17 Alan Coon <alanc...@apple.com>
Cherry-pick r255881. rdar://problem/59447271
Modified: branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h (259691 => 259692)
--- branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h 2020-04-08 00:32:35 UTC (rev 259691)
+++ branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h 2020-04-08 00:32:39 UTC (rev 259692)
@@ -290,6 +290,11 @@
#define AVRouteDetectorMultipleRoutesDetectedDidChangeNotification PAL::get_AVFoundation_AVRouteDetectorMultipleRoutesDetectedDidChangeNotification()
SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVAudioSessionMediaServicesWereResetNotification, NSString *)
#define AVAudioSessionMediaServicesWereResetNotification PAL::get_AVFoundation_AVAudioSessionMediaServicesWereResetNotification()
-#endif // PLATFORM(IOS_FAMILY)
+#endif // PLATFORM(IOS_FAMILY)
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+SOFT_LINK_FUNCTION_FOR_HEADER(PAL, AVFoundation, AVCaptureSessionSetAuthorizedToUseCameraInMultipleForegroundAppLayout, void, (AVCaptureSession *session), (session))
+#define AVCaptureSessionSetAuthorizedToUseCameraInMultipleForegroundAppLayout softLink_AVFoundation_AVCaptureSessionSetAuthorizedToUseCameraInMultipleForegroundAppLayout
+#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+
#endif // USE(AVFOUNDATION)
Modified: branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm (259691 => 259692)
--- branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm 2020-04-08 00:32:35 UTC (rev 259691)
+++ branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm 2020-04-08 00:32:39 UTC (rev 259692)
@@ -217,4 +217,8 @@
SOFT_LINK_CONSTANT_MAY_FAIL_FOR_SOURCE_WITH_EXPORT(PAL, AVFoundation, AVURLAssetRequiresCustomURLLoadingKey, NSString *, PAL_EXPORT)
#endif
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, AVFoundation, AVCaptureSessionSetAuthorizedToUseCameraInMultipleForegroundAppLayout, void, (AVCaptureSession *session), (session))
+#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
+
#endif // USE(AVFOUNDATION)
Modified: branches/safari-609-branch/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm (259691 => 259692)
--- branches/safari-609-branch/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2020-04-08 00:32:35 UTC (rev 259691)
+++ branches/safari-609-branch/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm 2020-04-08 00:32:39 UTC (rev 259692)
@@ -394,6 +394,9 @@
ALWAYS_LOG_IF(loggerPtr(), LOGIDENTIFIER);
m_session = adoptNS([PAL::allocAVCaptureSessionInstance() init]);
+#if PLATFORM(IOS_FAMILY)
+ AVCaptureSessionSetAuthorizedToUseCameraInMultipleForegroundAppLayout(m_session.get());
+#endif
[m_session addObserver:m_objcObserver.get() forKeyPath:@"running" options:NSKeyValueObservingOptionNew context:(void *)nil];
[m_session beginConfiguration];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
