[webkit-changes] [WebKit/WebKit] c44cb3: [macOS] Screen/window picker sometimes remains aft...

Eric Carlson noreply at github.com
Thu Jul 13 10:44:59 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: c44cb30770746f9750c34f9444895d1eaa549758
      https://github.com/WebKit/WebKit/commit/c44cb30770746f9750c34f9444895d1eaa549758
  Author: Eric Carlson <eric.carlson at apple.com>
  Date:   2023-07-13 (Thu, 13 Jul 2023)

  Changed paths:
    M Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm
    M Source/WebCore/platform/mediastream/mac/ScreenCaptureKitSharingSessionManager.h
    M Source/WebCore/platform/mediastream/mac/ScreenCaptureKitSharingSessionManager.mm

  Log Message:
  -----------
  [macOS] Screen/window picker sometimes remains after capture stops
https://bugs.webkit.org/show_bug.cgi?id=259189
rdar://112195888

Reviewed by Youenn Fablet and Jer Noble.

Deactivate the screen/window picker during session cleanup unless another picking session
is active, so the menu is hidden when there are no active capture streams.

* Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm:
(WebCore::ScreenCaptureKitCaptureSource::stop): Clear `m_sessionSource` immediately instead
of in the stop lambda, there is no reason to wait.

* Source/WebCore/platform/mediastream/mac/ScreenCaptureKitSharingSessionManager.h
* Source/WebCore/platform/mediastream/mac/ScreenCaptureKitSharingSessionManager.mm:
(WebCore::ScreenCaptureKitSharingSessionManager::cleanupSessionSource): If a prompt isn't
active, call `cancelPicking` to cleanup.

Canonical link: https://commits.webkit.org/266041@main




More information about the webkit-changes mailing list