Title: [293809] trunk/Source/WebCore
- Revision
- 293809
- Author
- eric.carl...@apple.com
- Date
- 2022-05-04 18:01:15 -0700 (Wed, 04 May 2022)
Log Message
[macOS] ScreenCaptureKitCaptureSource should stop content sharing session when capture ends
https://bugs.webkit.org/show_bug.cgi?id=240086
rdar://91008087
Reviewed by Jer Noble.
Tested manually.
* platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm:
(WebCore::ScreenCaptureKitCaptureSource::~ScreenCaptureKitCaptureSource): Call
-[SCContentSharingSession end].
(WebCore::ScreenCaptureKitCaptureSource::sessionDidEnd): Ditto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (293808 => 293809)
--- trunk/Source/WebCore/ChangeLog 2022-05-05 00:51:07 UTC (rev 293808)
+++ trunk/Source/WebCore/ChangeLog 2022-05-05 01:01:15 UTC (rev 293809)
@@ -1,3 +1,18 @@
+2022-05-04 Eric Carlson <eric.carl...@apple.com>
+
+ [macOS] ScreenCaptureKitCaptureSource should stop content sharing session when capture ends
+ https://bugs.webkit.org/show_bug.cgi?id=240086
+ rdar://91008087
+
+ Reviewed by Jer Noble.
+
+ Tested manually.
+
+ * platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm:
+ (WebCore::ScreenCaptureKitCaptureSource::~ScreenCaptureKitCaptureSource): Call
+ -[SCContentSharingSession end].
+ (WebCore::ScreenCaptureKitCaptureSource::sessionDidEnd): Ditto.
+
2022-05-04 Michael Saboff <msab...@apple.com>
[Mac] WebCore should search system content path for nested Frameworks
Modified: trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm (293808 => 293809)
--- trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm 2022-05-05 00:51:07 UTC (rev 293808)
+++ trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm 2022-05-05 01:01:15 UTC (rev 293809)
@@ -210,6 +210,10 @@
ScreenCaptureKitCaptureSource::~ScreenCaptureKitCaptureSource()
{
+ if (m_contentSharingSession) {
+ [m_contentSharingSession end];
+ m_contentSharingSession = nullptr;
+ }
}
bool ScreenCaptureKitCaptureSource::start()
@@ -302,6 +306,11 @@
void ScreenCaptureKitCaptureSource::sessionDidEnd(RetainPtr<SCContentSharingSession>)
{
+ if (m_contentSharingSession) {
+ [m_contentSharingSession end];
+ m_contentSharingSession = nullptr;
+ }
+
streamFailedWithError(nil, "sessionDidEnd"_s);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
