Bug 222166 – Update camera and microphone capture state control WKWebView API

• Status: RESOLVED
• Resolution: FIXED
• Component: WebRTC

[youenn fablet]

Update camera and microphone capture state control WKWebView API

[youenn fablet]

Created attachment 420961 [details]
Patch

[youenn fablet]

Created attachment 420962 [details]
Patch

[youenn fablet]

Created attachment 420971 [details]
Patch

[Eric Carlson]

Comment on attachment 420962 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=420962&action=review

> Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp:524
> +static inline bool trackMatchesKind(RealtimeMediaSource::Type type, MediaProducer::MediaCaptureKind kind)

Nit: `trackMatchesKind` is slightly awkward. Maybe `isKindOfTrack`, or `isTypeOfTrack` instead?

> Source/WebCore/page/MediaProducer.h:72
> +    enum class MediaCaptureKind {

Nit: `Kind` doesn't seem right. RealtimeMediaSource's `Type` is analogous, so how about `MediaCaptureType`?

> Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:1741
> +    auto mutedState = _page->mutedStateFlags();

I think `pageMutedState` would make the logic easier to follow.

> Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:1745
> +        mutedState = WebCore::MediaProducer::AudioCaptureIsMuted;

Don't you want to just add the muted flag:  `mutedState |= WebCore::MediaProducer::AudioCaptureIsMuted`?

> Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:1747
> +    _page->setMuted(mutedState, [completionHandler = makeBlockPtr(completionHandler)] {
> +        completionHandler();

If the page microphone capture state is already already muted, why not just call the completion handler immediately and return?

> Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:1766
> +    auto mutedState = _page->mutedStateFlags();
> +    if (state == _WKMediaCaptureStateActive && mutedState & WebCore::MediaProducer::VideoCaptureIsMuted)
> +        mutedState ^= WebCore::MediaProducer::VideoCaptureIsMuted;
> +    else if (state == _WKMediaCaptureStateMuted)
> +        mutedState = WebCore::MediaProducer::VideoCaptureIsMuted;
> +    _page->setMuted(mutedState, [completionHandler = makeBlockPtr(completionHandler)] {
> +        completionHandler();
> +    });

Ditto the comments above.

> Source/WebKit/UIProcess/Cocoa/PageClientImplCocoa.mm:159
> +void PageClientImplCocoa::microphoneCaptureChanged()
> +{
> +    [m_webView didChangeValueForKey:@"_microphoneCaptureState"];
> +}
> +
> +void PageClientImplCocoa::cameraCaptureChanged()

s/*CaptureChanged/*CaptureStateChanged/

[Radar WebKit Bug Importer]

<rdar://problem/74788059>

[youenn fablet]

Comment on attachment 420971 [details]
Patch

win failure unrelated

[EWS]

Tools/Scripts/svn-apply failed to apply attachment 420971 [details] to trunk.
Please resolve the conflicts and upload a new patch.

[youenn fablet]

Created attachment 422218 [details]
Rebasing

[EWS]

Committed r273891: <https://commits.webkit.org/r273891>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 422218 [details].