Title: [282775] trunk/Source/WebCore
- Revision
- 282775
- Author
- da...@apple.com
- Date
- 2021-09-20 13:39:20 -0700 (Mon, 20 Sep 2021)
Log Message
Clean up overrides of DisplayCaptureSourceMac::Capturer::generateFrame()
<https://webkit.org/b/230491>
<rdar://problem/83315212>
Reviewed by David Kilzer.
* platform/mediastream/mac/CGDisplayStreamCaptureSource.cpp:
(WebCore::CGDisplayStreamCaptureSource::generateFrame):
* platform/mediastream/mac/CGWindowCaptureSource.mm:
(WebCore::CGWindowCaptureSource::generateFrame):
- Simplify return value _expression_.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (282774 => 282775)
--- trunk/Source/WebCore/ChangeLog 2021-09-20 20:37:57 UTC (rev 282774)
+++ trunk/Source/WebCore/ChangeLog 2021-09-20 20:39:20 UTC (rev 282775)
@@ -1,3 +1,17 @@
+2021-09-20 Darin Adler <da...@apple.com>
+
+ Clean up overrides of DisplayCaptureSourceMac::Capturer::generateFrame()
+ <https://webkit.org/b/230491>
+ <rdar://problem/83315212>
+
+ Reviewed by David Kilzer.
+
+ * platform/mediastream/mac/CGDisplayStreamCaptureSource.cpp:
+ (WebCore::CGDisplayStreamCaptureSource::generateFrame):
+ * platform/mediastream/mac/CGWindowCaptureSource.mm:
+ (WebCore::CGWindowCaptureSource::generateFrame):
+ - Simplify return value _expression_.
+
2021-09-20 Peng Liu <peng.l...@apple.com>
[GPUP] Videos appear black but audio plays normally
Modified: trunk/Source/WebCore/platform/mediastream/mac/CGDisplayStreamCaptureSource.cpp (282774 => 282775)
--- trunk/Source/WebCore/platform/mediastream/mac/CGDisplayStreamCaptureSource.cpp 2021-09-20 20:37:57 UTC (rev 282774)
+++ trunk/Source/WebCore/platform/mediastream/mac/CGDisplayStreamCaptureSource.cpp 2021-09-20 20:39:20 UTC (rev 282775)
@@ -73,7 +73,7 @@
DisplayCaptureSourceMac::DisplayFrameType CGDisplayStreamCaptureSource::generateFrame()
{
- return DisplayCaptureSourceMac::DisplayFrameType { RetainPtr<IOSurfaceRef> { m_currentFrame.ioSurface() } };
+ return RetainPtr { m_currentFrame.ioSurface() };
}
bool CGDisplayStreamCaptureSource::startDisplayStream()
Modified: trunk/Source/WebCore/platform/mediastream/mac/CGWindowCaptureSource.mm (282774 => 282775)
--- trunk/Source/WebCore/platform/mediastream/mac/CGWindowCaptureSource.mm 2021-09-20 20:37:57 UTC (rev 282774)
+++ trunk/Source/WebCore/platform/mediastream/mac/CGWindowCaptureSource.mm 2021-09-20 20:39:20 UTC (rev 282775)
@@ -153,7 +153,7 @@
DisplayCaptureSourceMac::DisplayFrameType CGWindowCaptureSource::generateFrame()
{
- return DisplayCaptureSourceMac::DisplayFrameType { RetainPtr<CGImageRef> { windowImage() } };
+ return NativeImage::create(windowImage());
}
std::optional<CaptureDevice> CGWindowCaptureSource::windowCaptureDeviceWithPersistentID(const String& idString)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
