Diff
Modified: trunk/Source/WTF/ChangeLog (294263 => 294264)
--- trunk/Source/WTF/ChangeLog 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WTF/ChangeLog 2022-05-16 21:44:55 UTC (rev 294264)
@@ -1,3 +1,16 @@
+2022-05-16 Brent Fulgham <bfulg...@apple.com>
+
+ Remove abandoned UseScreenCaptureKit preference
+ https://bugs.webkit.org/show_bug.cgi?id=240460
+ <rdar://problem/93351960>
+
+ Reviewed by Youenn Fablet.
+
+ We no longer need this switch to activate ScreenCaptureKit, and this code is no
+ longer used. We should remove it to simplify the build and reduce complexity.
+
+ * Scripts/Preferences/WebPreferencesExperimental.yaml:
+
2022-05-15 Wenson Hsieh <wenson_hs...@apple.com>
Right click > "Open Link" should trigger a navigation action with WKNavigationTypeLinkActivated
Modified: trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml (294263 => 294264)
--- trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WTF/Scripts/Preferences/WebPreferencesExperimental.yaml 2022-05-16 21:44:55 UTC (rev 294264)
@@ -1494,19 +1494,6 @@
"PLATFORM(WIN)": true
default: false
-UseScreenCaptureKit:
- type: bool
- condition: HAVE(SCREEN_CAPTURE_KIT)
- humanReadableName: "Use ScreenCaptureKit"
- humanReadableDescription: "Use ScreenCaptureKit when available"
- defaultValue:
- WebKitLegacy:
- default: false
- WebKit:
- default: WebKit::defaultScreenCaptureKitEnabled()
- WebCore:
- default: false
-
UserGesturePromisePropagationEnabled:
type: bool
humanReadableName: "UserGesture Promise Propagation"
Modified: trunk/Source/WebCore/ChangeLog (294263 => 294264)
--- trunk/Source/WebCore/ChangeLog 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebCore/ChangeLog 2022-05-16 21:44:55 UTC (rev 294264)
@@ -1,3 +1,18 @@
+2022-05-16 Brent Fulgham <bfulg...@apple.com>
+
+ Remove abandoned UseScreenCaptureKit preference
+ https://bugs.webkit.org/show_bug.cgi?id=240460
+ <rdar://problem/93351960>
+
+ Reviewed by Youenn Fablet.
+
+ We no longer need this switch to activate ScreenCaptureKit, and this code is no
+ longer used. We should remove it to simplify the build and reduce complexity.
+
+ * platform/mediastream/RealtimeMediaSourceCenter.h:
+ (WebCore::RealtimeMediaSourceCenter::useScreenCaptureKit const): Deleted.
+ (WebCore::RealtimeMediaSourceCenter::setUseScreenCaptureKit): Deleted.
+
2022-05-16 Michael Catanzaro <mcatanz...@redhat.com>
Unreviewed, fix build after 250565@main
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.h (294263 => 294264)
--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.h 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSourceCenter.h 2022-05-16 21:44:55 UTC (rev 294264)
@@ -110,11 +110,6 @@
OSObjectPtr<tcc_identity_t> identity() const { return m_identity; }
#endif
-#if HAVE(SCREEN_CAPTURE_KIT)
- bool useScreenCaptureKit() const;
- void setUseScreenCaptureKit(bool);
-#endif
-
private:
RealtimeMediaSourceCenter();
friend class NeverDestroyed<RealtimeMediaSourceCenter>;
@@ -150,24 +145,9 @@
OSObjectPtr<tcc_identity_t> m_identity;
#endif
-#if HAVE(SCREEN_CAPTURE_KIT)
- bool m_useScreenCaptureKit { false };
-#endif
bool m_useMockCaptureDevices { false };
};
-#if HAVE(SCREEN_CAPTURE_KIT)
-inline bool RealtimeMediaSourceCenter::useScreenCaptureKit() const
-{
- return m_useScreenCaptureKit;
-}
-
-inline void RealtimeMediaSourceCenter::setUseScreenCaptureKit(bool useScreenCaptureKit)
-{
- m_useScreenCaptureKit = useScreenCaptureKit;
-}
-#endif
-
} // namespace WebCore
#endif // ENABLE(MEDIA_STREAM)
Modified: trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.h (294263 => 294264)
--- trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.h 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.h 2022-05-16 21:44:55 UTC (rev 294264)
@@ -57,7 +57,6 @@
virtual ~ScreenCaptureKitCaptureSource();
WEBCORE_EXPORT static bool isAvailable();
- WEBCORE_EXPORT static void setEnabled(bool);
static std::optional<CaptureDevice> screenCaptureDeviceWithPersistentID(const String&);
WEBCORE_EXPORT static void screenCaptureDevices(Vector<CaptureDevice>&);
@@ -119,7 +118,6 @@
uint32_t m_height { 0 };
float m_frameRate { 0 };
bool m_isRunning { false };
- static bool m_enabled;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm (294263 => 294264)
--- trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebCore/platform/mediastream/mac/ScreenCaptureKitCaptureSource.mm 2022-05-16 21:44:55 UTC (rev 294264)
@@ -154,16 +154,9 @@
static void forEachNSWindow(const Function<bool(NSDictionary *, unsigned, const String&)>&);
-bool ScreenCaptureKitCaptureSource::m_enabled;
-
-void ScreenCaptureKitCaptureSource::setEnabled(bool enabled)
-{
- m_enabled = enabled;
-}
-
bool ScreenCaptureKitCaptureSource::isAvailable()
{
- return m_enabled && PAL::isScreenCaptureKitFrameworkAvailable();
+ return PAL::isScreenCaptureKitFrameworkAvailable();
}
Expected<UniqueRef<DisplayCaptureSourceCocoa::Capturer>, String> ScreenCaptureKitCaptureSource::create(const CaptureDevice& device, const MediaConstraints*)
Modified: trunk/Source/WebKit/ChangeLog (294263 => 294264)
--- trunk/Source/WebKit/ChangeLog 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebKit/ChangeLog 2022-05-16 21:44:55 UTC (rev 294264)
@@ -1,3 +1,30 @@
+2022-05-16 Brent Fulgham <bfulg...@apple.com>
+
+ Remove abandoned UseScreenCaptureKit preference
+ https://bugs.webkit.org/show_bug.cgi?id=240460
+ <rdar://problem/93351960>
+
+ Reviewed by Youenn Fablet.
+
+ We no longer need this switch to activate ScreenCaptureKit, and this code is no
+ longer used. We should remove it to simplify the build and reduce complexity.
+
+ * GPUProcess/GPUProcess.cpp:
+ (WebKit::GPUProcess::setUseScreenCaptureKit): Deleted.
+ * GPUProcess/GPUProcess.h:
+ * GPUProcess/GPUProcess.messages.in:
+ * Shared/WebPreferencesDefaultValues.cpp:
+ (WebKit::defaultScreenCaptureKitEnabled): Deleted.
+ * Shared/WebPreferencesDefaultValues.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _useScreenCaptureKit]): Deleted.
+ (-[WKPreferences _setUseScreenCaptureKit:]): Deleted.
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h:
+ * UIProcess/GPU/GPUProcessProxy.cpp:
+ (WebKit::GPUProcessProxy::updatePreferences):
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::UserMediaPermissionRequestManagerProxy::syncWithWebCorePrefs const):
+
2022-05-16 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, reverting r294238.
Modified: trunk/Source/WebKit/GPUProcess/GPUProcess.cpp (294263 => 294264)
--- trunk/Source/WebKit/GPUProcess/GPUProcess.cpp 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebKit/GPUProcess/GPUProcess.cpp 2022-05-16 21:44:55 UTC (rev 294264)
@@ -539,16 +539,6 @@
}
#endif
-#if HAVE(SCREEN_CAPTURE_KIT)
-void GPUProcess::setUseScreenCaptureKit(bool use)
-{
- if (m_useScreenCaptureKit == use)
- return;
- m_useScreenCaptureKit = use;
- WebCore::ScreenCaptureKitCaptureSource::setEnabled(m_useScreenCaptureKit);
-}
-#endif
-
#if HAVE(AVCONTENTKEYSPECIFIER)
void GPUProcess::setSampleBufferContentKeySessionSupportEnabled(bool enabled)
{
Modified: trunk/Source/WebKit/GPUProcess/GPUProcess.h (294263 => 294264)
--- trunk/Source/WebKit/GPUProcess/GPUProcess.h 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebKit/GPUProcess/GPUProcess.h 2022-05-16 21:44:55 UTC (rev 294264)
@@ -188,10 +188,6 @@
void setMediaSourceInlinePaintingEnabled(bool);
#endif
-#if HAVE(SCREEN_CAPTURE_KIT)
- void setUseScreenCaptureKit(bool);
-#endif
-
#if HAVE(AVCONTENTKEYSPECIFIER)
void setSampleBufferContentKeySessionSupportEnabled(bool);
#endif
@@ -262,9 +258,6 @@
#if ENABLE(MEDIA_SOURCE) && HAVE(AVSAMPLEBUFFERVIDEOOUTPUT)
bool m_mediaSourceInlinePaintingEnabled { false };
#endif
-#if HAVE(SCREEN_CAPTURE_KIT)
- bool m_useScreenCaptureKit { false };
-#endif
#if HAVE(AVCONTENTKEYSPECIFIER)
bool m_sampleBufferContentKeySessionSupportEnabled { false };
#endif
Modified: trunk/Source/WebKit/GPUProcess/GPUProcess.messages.in (294263 => 294264)
--- trunk/Source/WebKit/GPUProcess/GPUProcess.messages.in 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebKit/GPUProcess/GPUProcess.messages.in 2022-05-16 21:44:55 UTC (rev 294264)
@@ -77,10 +77,6 @@
SetMediaSourceInlinePaintingEnabled(bool enabled);
#endif
-#if HAVE(SCREEN_CAPTURE_KIT)
- SetUseScreenCaptureKit(bool use);
-#endif
-
#if HAVE(AVCONTENTKEYSPECIFIER)
SetSampleBufferContentKeySessionSupportEnabled(bool enabled);
#endif
Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (294263 => 294264)
--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2022-05-16 21:44:55 UTC (rev 294264)
@@ -163,16 +163,4 @@
}
#endif
-#if HAVE(SCREEN_CAPTURE_KIT)
-bool defaultScreenCaptureKitEnabled()
-{
-#if ENABLE(SCREEN_CAPTURE_KIT)
- return true;
-#else
- return false;
-#endif
-}
-#endif // HAVE(SCREEN_CAPTURE_KIT)
-
-
} // namespace WebKit
Modified: trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h (294263 => 294264)
--- trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2022-05-16 21:44:55 UTC (rev 294264)
@@ -77,10 +77,6 @@
bool defaultMediaSessionCoordinatorEnabled();
#endif
-#if HAVE(SCREEN_CAPTURE_KIT)
-bool defaultScreenCaptureKitEnabled();
-#endif
-
#if ENABLE(IMAGE_ANALYSIS)
bool defaultTextRecognitionEnhancementsEnabled();
bool defaultImageAnalysisQueueEnabled();
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm (294263 => 294264)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferences.mm 2022-05-16 21:44:55 UTC (rev 294264)
@@ -684,16 +684,6 @@
_preferences->setMediaCaptureRequiresSecureConnection(requiresSecureConnection);
}
-- (BOOL)_useScreenCaptureKit
-{
- return _preferences->useScreenCaptureKit();
-}
-
-- (void)_setUseScreenCaptureKit:(BOOL)useScreenCaptureKit
-{
- _preferences->setUseScreenCaptureKit(useScreenCaptureKit);
-}
-
- (double)_inactiveMediaCaptureSteamRepromptIntervalInMinutes
{
return _preferences->inactiveMediaCaptureSteamRepromptIntervalInMinutes();
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h (294263 => 294264)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2022-05-16 21:44:55 UTC (rev 294264)
@@ -122,7 +122,6 @@
@property (nonatomic, setter=_setMockCaptureDevicesEnabled:) BOOL _mockCaptureDevicesEnabled WK_API_AVAILABLE(macos(10.13), ios(11.0));
@property (nonatomic, setter=_setMockCaptureDevicesPromptEnabled:) BOOL _mockCaptureDevicesPromptEnabled WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
@property (nonatomic, setter=_setMediaCaptureRequiresSecureConnection:) BOOL _mediaCaptureRequiresSecureConnection WK_API_AVAILABLE(macos(10.13), ios(11.0));
-@property (nonatomic, setter=_setUseScreenCaptureKit:) BOOL _useScreenCaptureKit WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
@property (nonatomic, setter=_setEnumeratingAllNetworkInterfacesEnabled:) BOOL _enumeratingAllNetworkInterfacesEnabled WK_API_AVAILABLE(macos(10.13), ios(11.0));
@property (nonatomic, setter=_setICECandidateFilteringEnabled:) BOOL _iceCandidateFilteringEnabled WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
@property (nonatomic, setter=_setWebRTCLegacyAPIEnabled:) BOOL _webRTCLegacyAPIEnabled WK_API_AVAILABLE(macos(10.13), ios(11.0));
Modified: trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp (294263 => 294264)
--- trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp 2022-05-16 21:44:55 UTC (rev 294264)
@@ -647,13 +647,6 @@
}
#endif
-#if HAVE(SCREEN_CAPTURE_KIT)
- if (!m_hasEnabledScreenCaptureKit && preferences.useScreenCaptureKit()) {
- m_hasEnabledScreenCaptureKit = true;
- send(Messages::GPUProcess::SetUseScreenCaptureKit(m_hasEnabledScreenCaptureKit), 0);
- }
-#endif
-
#if HAVE(AVCONTENTKEYSPECIFIER)
if (!m_hasEnabledSampleBufferContentKeySessionSupport && preferences.sampleBufferContentKeySessionSupportEnabled()) {
m_hasEnabledSampleBufferContentKeySessionSupport = true;
Modified: trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (294263 => 294264)
--- trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2022-05-16 21:44:55 UTC (rev 294264)
@@ -910,10 +910,6 @@
m_page.process().processPool().ensureGPUProcess().setUseMockCaptureDevices(mockDevicesEnabled);
#endif
-#if HAVE(SCREEN_CAPTURE_KIT)
- WebCore::ScreenCaptureKitCaptureSource::setEnabled(m_page.preferences().useScreenCaptureKit());
-#endif
-
if (MockRealtimeMediaSourceCenter::mockRealtimeMediaSourceCenterEnabled() == mockDevicesEnabled)
return;
MockRealtimeMediaSourceCenter::setMockRealtimeMediaSourceCenterEnabled(mockDevicesEnabled);
Modified: trunk/Tools/ChangeLog (294263 => 294264)
--- trunk/Tools/ChangeLog 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Tools/ChangeLog 2022-05-16 21:44:55 UTC (rev 294264)
@@ -1,3 +1,17 @@
+2022-05-16 Brent Fulgham <bfulg...@apple.com>
+
+ Remove abandoned UseScreenCaptureKit preference
+ https://bugs.webkit.org/show_bug.cgi?id=240460
+ <rdar://problem/93351960>
+
+ Reviewed by Youenn Fablet.
+
+ We no longer need this switch to activate ScreenCaptureKit, and this code is no
+ longer used. We should remove it to simplify the build and reduce complexity.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/GetDisplayMediaWindowAndScreen.mm:
+ (TestWebKitAPI::TEST):
+
2022-05-16 Ryan Haddad <ryanhad...@apple.com>
Unreviewed, reverting r294238.
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/GetDisplayMediaWindowAndScreen.mm (294263 => 294264)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/GetDisplayMediaWindowAndScreen.mm 2022-05-16 21:43:21 UTC (rev 294263)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/GetDisplayMediaWindowAndScreen.mm 2022-05-16 21:44:55 UTC (rev 294264)
@@ -127,7 +127,6 @@
auto preferences = [configuration preferences];
preferences._mediaCaptureRequiresSecureConnection = NO;
preferences._mockCaptureDevicesEnabled = YES;
- preferences._useScreenCaptureKit = YES;
auto delegate = adoptNS([[UserMediaCaptureUIDelegate alloc] init]);
auto webView = adoptNS([[WindowAndScreenCaptureTestView alloc] initWithFrame:CGRectMake(0, 0, 320, 500) configuration:configuration.get()]);
