Modified: trunk/Source/WebKit/ChangeLog (289719 => 289720)
--- trunk/Source/WebKit/ChangeLog 2022-02-13 20:48:52 UTC (rev 289719)
+++ trunk/Source/WebKit/ChangeLog 2022-02-13 21:07:52 UTC (rev 289720)
@@ -1,3 +1,17 @@
+2022-02-13 Wenson Hsieh <[email protected]>
+
+ Unreviewed, fix the internal macOS build
+
+ Add some missing `WebCore` namespaces (which are presumably now necessary due to changes in unified source
+ groupings).
+
+ * UIProcess/mac/DisplayCaptureSessionManager.mm:
+ (WebKit::alertForWindowSelection):
+ (WebKit::DisplayCaptureSessionManager::deviceSelectedForTesting):
+ (WebKit::DisplayCaptureSessionManager::showWindowPicker):
+ (WebKit::DisplayCaptureSessionManager::showScreenPicker):
+ (WebKit::DisplayCaptureSessionManager::isAvailable):
+
2022-02-12 Gavin Phillips <[email protected]>
Update preference location used for CaptivePortalMode.
Modified: trunk/Source/WebKit/UIProcess/mac/DisplayCaptureSessionManager.mm (289719 => 289720)
--- trunk/Source/WebKit/UIProcess/mac/DisplayCaptureSessionManager.mm 2022-02-13 20:48:52 UTC (rev 289719)
+++ trunk/Source/WebKit/UIProcess/mac/DisplayCaptureSessionManager.mm 2022-02-13 21:07:52 UTC (rev 289720)
@@ -57,8 +57,8 @@
return;
}
- Vector<DisplayCaptureManager::WindowCaptureDevice> windowInfo;
- RealtimeMediaSourceCenter::singleton().displayCaptureFactory().displayCaptureDeviceManager().windowDevices(windowInfo);
+ Vector<WebCore::DisplayCaptureManager::WindowCaptureDevice> windowInfo;
+ WebCore::RealtimeMediaSourceCenter::singleton().displayCaptureFactory().displayCaptureDeviceManager().windowDevices(windowInfo);
if (windowInfo.isEmpty()) {
completionHandler(std::nullopt, std::nullopt);
return;
@@ -176,12 +176,12 @@
}];
}
-std::optional<CaptureDevice> DisplayCaptureSessionManager::deviceSelectedForTesting(CaptureDevice::DeviceType deviceType)
+std::optional<WebCore::CaptureDevice> DisplayCaptureSessionManager::deviceSelectedForTesting(WebCore::CaptureDevice::DeviceType deviceType)
{
ASSERT(m_indexOfDeviceSelectedForTesting);
unsigned index = 0;
- for (auto& device : RealtimeMediaSourceCenter::singleton().displayCaptureFactory().displayCaptureDeviceManager().captureDevices()) {
+ for (auto& device : WebCore::RealtimeMediaSourceCenter::singleton().displayCaptureFactory().displayCaptureDeviceManager().captureDevices()) {
if (device.enabled() && device.type() == deviceType) {
if (index == m_indexOfDeviceSelectedForTesting.value())
return { device };
@@ -192,16 +192,16 @@
return std::nullopt;
}
-void DisplayCaptureSessionManager::showWindowPicker(WebPageProxy& page, const WebCore::SecurityOriginData& origin, CompletionHandler<void(std::optional<CaptureDevice>)>&& completionHandler)
+void DisplayCaptureSessionManager::showWindowPicker(WebPageProxy& page, const WebCore::SecurityOriginData& origin, CompletionHandler<void(std::optional<WebCore::CaptureDevice>)>&& completionHandler)
{
if (m_indexOfDeviceSelectedForTesting) {
- completionHandler(deviceSelectedForTesting(CaptureDevice::DeviceType::Window));
+ completionHandler(deviceSelectedForTesting(WebCore::CaptureDevice::DeviceType::Window));
return;
}
#if HAVE(SC_CONTENT_SHARING_SESSION)
- if (ScreenCaptureKitSharingSessionManager::isAvailable()) {
- ScreenCaptureKitSharingSessionManager::singleton().showWindowPicker(WTFMove(completionHandler));
+ if (WebCore::ScreenCaptureKitSharingSessionManager::isAvailable()) {
+ WebCore::ScreenCaptureKitSharingSessionManager::singleton().showWindowPicker(WTFMove(completionHandler));
return;
}
#endif
@@ -213,28 +213,28 @@
return;
}
- CaptureDevice device = { windowID.value(), CaptureDevice::DeviceType::Window, windowTitle.value(), emptyString(), true };
+ WebCore::CaptureDevice device = { windowID.value(), WebCore::CaptureDevice::DeviceType::Window, windowTitle.value(), emptyString(), true };
completionHandler({ device });
});
}
-void DisplayCaptureSessionManager::showScreenPicker(WebPageProxy&, const WebCore::SecurityOriginData&, CompletionHandler<void(std::optional<CaptureDevice>)>&& completionHandler)
+void DisplayCaptureSessionManager::showScreenPicker(WebPageProxy&, const WebCore::SecurityOriginData&, CompletionHandler<void(std::optional<WebCore::CaptureDevice>)>&& completionHandler)
{
if (m_indexOfDeviceSelectedForTesting) {
- completionHandler(deviceSelectedForTesting(CaptureDevice::DeviceType::Screen));
+ completionHandler(deviceSelectedForTesting(WebCore::CaptureDevice::DeviceType::Screen));
return;
}
#if HAVE(SC_CONTENT_SHARING_SESSION)
- if (ScreenCaptureKitSharingSessionManager::isAvailable()) {
- ScreenCaptureKitSharingSessionManager::singleton().showScreenPicker(WTFMove(completionHandler));
+ if (WebCore::ScreenCaptureKitSharingSessionManager::isAvailable()) {
+ WebCore::ScreenCaptureKitSharingSessionManager::singleton().showScreenPicker(WTFMove(completionHandler));
return;
}
#endif
callOnMainRunLoop([completionHandler = WTFMove(completionHandler)] () mutable {
- for (auto& device : RealtimeMediaSourceCenter::singleton().displayCaptureFactory().displayCaptureDeviceManager().captureDevices()) {
- if (device.enabled() && device.type() == CaptureDevice::DeviceType::Screen) {
+ for (auto& device : WebCore::RealtimeMediaSourceCenter::singleton().displayCaptureFactory().displayCaptureDeviceManager().captureDevices()) {
+ if (device.enabled() && device.type() == WebCore::CaptureDevice::DeviceType::Screen) {
completionHandler({ device });
return;
}
@@ -248,7 +248,7 @@
bool DisplayCaptureSessionManager::isAvailable()
{
#if HAVE(SCREEN_CAPTURE_KIT)
- return ScreenCaptureKitCaptureSource::isAvailable();
+ return WebCore::ScreenCaptureKitCaptureSource::isAvailable();
#else
return false;
#endif
