Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 1ca60460dcf47edc57527b601e07f5f793ae6299
https://github.com/WebKit/WebKit/commit/1ca60460dcf47edc57527b601e07f5f793ae6299
Author: Frédéric Wang Nélar <[email protected]>
Date: 2026-10-12 (Mon, 12 Oct 2026)
Changed paths:
A
LayoutTests/fast/mediastream/getDisplayMedia-displaySurface-crash-expected.txt
A LayoutTests/fast/mediastream/getDisplayMedia-displaySurface-crash.html
M Source/WebCore/Modules/mediastream/MediaDevices.cpp
M Source/WebCore/platform/mediastream/MediaConstraints.cpp
M Source/WebCore/platform/mediastream/MediaConstraints.h
M Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp
M Source/WebKit/Shared/WebCoreArgumentCodersMedia.serialization.in
Log Message:
-----------
Treat media track constraint displaySurface as a string constraint.
https://bugs.webkit.org/show_bug.cgi?id=326970
Reviewed by Eric Carlson.
displaySurface was introduced as a ConstrainDOMString but internally
treated as a ConstrainBoolean, leading to assertion failures in debug
mode. This PR fixes the type mismatch.
Test: fast/mediastream/getDisplayMedia-displaySurface-crash.html
*
LayoutTests/fast/mediastream/getDisplayMedia-displaySurface-crash-expected.txt:
Added.
* LayoutTests/fast/mediastream/getDisplayMedia-displaySurface-crash.html: Added.
* Source/WebCore/Modules/mediastream/MediaDevices.cpp:
(WebCore::hasInvalidGetDisplayMediaConstraint):
* Source/WebCore/platform/mediastream/MediaConstraints.cpp:
(WebCore::MediaTrackConstraintSetMap::set):
(WebCore::MediaTrackConstraintSetMap::merge):
(WebCore::MediaTrackConstraintSetMap::isValid const):
* Source/WebCore/platform/mediastream/MediaConstraints.h:
(WebCore::MediaTrackConstraintSetMap::MediaTrackConstraintSetMap):
* Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp: Keep 0 as the
fitness distance for displaySurface.
(WebCore::RealtimeMediaSource::applyConstraint):
* Source/WebKit/Shared/WebCoreArgumentCodersMedia.serialization.in:
Canonical link: https://commits.webkit.org/323459@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
