Changeset 245216 in webkit

Timestamp:

May 12, 2019 7:56:13 PM (5 years ago)

Author:

youenn@apple.com

Message:

Use the main screen for screen capture
​https://bugs.webkit.org/show_bug.cgi?id=197804
<rdar://problem/47671383>

Reviewed by Eric Carlson.

If the main screen, i.e. the screen that has focus at the time of
selection of the screen to capture, is capturable, add it to the list
of screen devices, but do not add any other screen.
This will make sure the main screen is selected.
Manually tested.

• platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm:

(WebCore::ScreenDisplayCaptureSourceMac::screenCaptureDevices):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-12  Youenn Fablet  <youenn@apple.com>
+
+        Use the main screen for screen capture
+        https://bugs.webkit.org/show_bug.cgi?id=197804
+        <rdar://problem/47671383>
+
+        Reviewed by Eric Carlson.
+
+        If the main screen, i.e. the screen that has focus at the time of
+        selection of the screen to capture, is capturable, add it to the list
+        of screen devices, but do not add any other screen.
+        This will make sure the main screen is selected.
+        Manually tested.
+
+        * platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm:
+        (WebCore::ScreenDisplayCaptureSourceMac::screenCaptureDevices):
+
 2019-05-12  Takashi Komori  <Takashi.Komori@sony.com>
 

trunk/Source/WebCore/platform/mediastream/mac/ScreenDisplayCaptureSourceMac.mm

@@ -36 +36 @@
 #include "NotImplemented.h"
 #include "PlatformLayer.h"
+#include "PlatformScreen.h"
 #include "RealtimeMediaSourceSettings.h"
 #include "RealtimeVideoUtilities.h"
@@ -304 +305 @@
 void ScreenDisplayCaptureSourceMac::screenCaptureDevices(Vector<CaptureDevice>& displays)
 {
+    auto screenID = displayID([NSScreen mainScreen]);
+    if (CGDisplayIDToOpenGLDisplayMask(screenID)) {
+        CaptureDevice displayDevice(String::number(screenID), CaptureDevice::DeviceType::Screen, makeString("Screen 0"));
+        displayDevice.setEnabled(true);
+        displays.append(WTFMove(displayDevice));
+        return;
+    }
+
     uint32_t displayCount = 0;
     auto err = CGGetActiveDisplayList(0, nullptr, &displayCount);