⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 259692 in webkit


Ignore:
Timestamp:
Apr 7, 2020, 5:32:39 PM (6 years ago)
Author:
Alan Coon
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

Location:
branches/safari-609-branch/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-609-branch/Source/WebCore/ChangeLog

    r259691 r259692  
     12020-04-07  Russell Epstein  <repstein@apple.com>
     2
     3        Cherry-pick r259388. rdar://problem/61269730
     4
     5    [iOS] Allow WebKit to use camera in multi-tasking mode
     6    https://bugs.webkit.org/show_bug.cgi?id=209904
     7   
     8    Reviewed by Youenn Fablet.
     9   
     10    Source/WebCore:
     11   
     12    * platform/mediastream/mac/AVVideoCaptureSource.mm:
     13    (WebCore::AVVideoCaptureSource::setupSession):
     14   
     15    Source/WebCore/PAL:
     16   
     17    * pal/cocoa/AVFoundationSoftLink.h:
     18    * pal/cocoa/AVFoundationSoftLink.mm:
     19   
     20    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259388 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     21
     22    2020-04-02  Eric Carlson  <eric.carlson@apple.com>
     23
     24            [iOS] Allow WebKit to use camera in multi-tasking mode
     25            https://bugs.webkit.org/show_bug.cgi?id=209904
     26
     27            Reviewed by Youenn Fablet.
     28
     29            * platform/mediastream/mac/AVVideoCaptureSource.mm:
     30            (WebCore::AVVideoCaptureSource::setupSession):
     31
    1322020-04-07  Russell Epstein  <repstein@apple.com>
    233

  • branches/safari-609-branch/Source/WebCore/PAL/ChangeLog

    r256818 r259692  
     12020-04-07  Russell Epstein  <repstein@apple.com>
     2
     3        Cherry-pick r259388. rdar://problem/61269730
     4
     5    [iOS] Allow WebKit to use camera in multi-tasking mode
     6    https://bugs.webkit.org/show_bug.cgi?id=209904
     7   
     8    Reviewed by Youenn Fablet.
     9   
     10    Source/WebCore:
     11   
     12    * platform/mediastream/mac/AVVideoCaptureSource.mm:
     13    (WebCore::AVVideoCaptureSource::setupSession):
     14   
     15    Source/WebCore/PAL:
     16   
     17    * pal/cocoa/AVFoundationSoftLink.h:
     18    * pal/cocoa/AVFoundationSoftLink.mm:
     19   
     20    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@259388 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     21
     22    2020-04-02  Eric Carlson  <eric.carlson@apple.com>
     23
     24            [iOS] Allow WebKit to use camera in multi-tasking mode
     25            https://bugs.webkit.org/show_bug.cgi?id=209904
     26
     27            Reviewed by Youenn Fablet.
     28
     29            * pal/cocoa/AVFoundationSoftLink.h:
     30            * pal/cocoa/AVFoundationSoftLink.mm:
     31
    1322020-02-17  Alan Coon  <alancoon@apple.com>
    233

  • branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.h

    r254476 r259692  
    291291SOFT_LINK_CONSTANT_FOR_HEADER(PAL, AVFoundation, AVAudioSessionMediaServicesWereResetNotification, NSString *)
    292292#define AVAudioSessionMediaServicesWereResetNotification PAL::get_AVFoundation_AVAudioSessionMediaServicesWereResetNotification()
    293 #endif //  PLATFORM(IOS_FAMILY)
     293#endif // PLATFORM(IOS_FAMILY)
     294
     295#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
     296SOFT_LINK_FUNCTION_FOR_HEADER(PAL, AVFoundation, AVCaptureSessionSetAuthorizedToUseCameraInMultipleForegroundAppLayout, void, (AVCaptureSession *session), (session))
     297#define AVCaptureSessionSetAuthorizedToUseCameraInMultipleForegroundAppLayout softLink_AVFoundation_AVCaptureSessionSetAuthorizedToUseCameraInMultipleForegroundAppLayout
     298#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
    294299
    295300#endif // USE(AVFOUNDATION)

  • branches/safari-609-branch/Source/WebCore/PAL/pal/cocoa/AVFoundationSoftLink.mm

    r254590 r259692  
    218218#endif
    219219
     220#if PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
     221SOFT_LINK_FUNCTION_FOR_SOURCE(PAL, AVFoundation, AVCaptureSessionSetAuthorizedToUseCameraInMultipleForegroundAppLayout, void, (AVCaptureSession *session), (session))
     222#endif // PLATFORM(IOS_FAMILY) && !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
     223
    220224#endif // USE(AVFOUNDATION)

  • branches/safari-609-branch/Source/WebCore/platform/mediastream/mac/AVVideoCaptureSource.mm

    r246644 r259692  
    395395
    396396    m_session = adoptNS([PAL::allocAVCaptureSessionInstance() init]);
     397#if PLATFORM(IOS_FAMILY)
     398    AVCaptureSessionSetAuthorizedToUseCameraInMultipleForegroundAppLayout(m_session.get());
     399#endif
    397400    [m_session addObserver:m_objcObserver.get() forKeyPath:@"running" options:NSKeyValueObservingOptionNew context:(void *)nil];
    398401
Note: See TracChangeset for help on using the changeset viewer.