Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: c3dc693948c295da745dfa16044aefc49295df80
https://github.com/WebKit/WebKit/commit/c3dc693948c295da745dfa16044aefc49295df80
Author: Jer Noble <[email protected]>
Date: 2026-07-27 (Mon, 27 Jul 2026)
Changed paths:
M
LayoutTests/media/encrypted-media/clearKey/clearKey-cenc-audio-playback-mse.html
M
LayoutTests/media/encrypted-media/clearKey/clearKey-cenc-stop-playback-before-key.html
M
LayoutTests/media/encrypted-media/clearKey/clearKey-cenc-video-playback-mse-multikey.html
M
LayoutTests/media/encrypted-media/clearKey/clearKey-cenc-video-playback-mse.html
M
LayoutTests/media/encrypted-media/clearKey/clearKey-message-cenc-event-mse.html
M
LayoutTests/media/encrypted-media/clearKey/clearKey-message-cenc-event.html
M
LayoutTests/media/encrypted-media/clearKey/clearKey-webm-video-playback-mse.html
M
LayoutTests/media/encrypted-media/clearKey/encrypted-media-clearKey-handler.js
M
LayoutTests/media/encrypted-media/encrypted-media-append-clear-encrypted.html
M
LayoutTests/media/encrypted-media/encrypted-media-append-encrypted-unencrypted.html
A
LayoutTests/media/encrypted-media/mock-MediaKeySession-invariants-expected.txt
A LayoutTests/media/encrypted-media/mock-MediaKeySession-invariants.html
A
LayoutTests/media/encrypted-media/mock-MediaKeySession-persistence-expected.txt
A LayoutTests/media/encrypted-media/mock-MediaKeySession-persistence.html
M
LayoutTests/media/encrypted-media/mock-navigator-requestMediaKeySystemAccess-expected.txt
M
LayoutTests/media/encrypted-media/mock-navigator-requestMediaKeySystemAccess.html
M
LayoutTests/platform/glib/imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-requestmediakeysystemaccess.https-expected.txt
M Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp
M Source/WebCore/platform/encryptedmedia/CDMPrivate.cpp
M Source/WebCore/testing/MockCDMFactory.cpp
M Source/WebCore/testing/MockCDMFactory.h
M Source/WebCore/testing/MockCDMFactory.idl
Log Message:
-----------
[Testing] Add more mock- tests for EME
rdar://182833486
https://bugs.webkit.org/show_bug.cgi?id=319912
Reviewed by Eric Carlson.
Adds LayoutTests for 14 previously-uncovered EME spec behaviors, plus
mock-CDM plumbing to enable the new invariants and persistence tests.
Writing the tests surfaced three implementation gaps whose bodies were
already commented in as spec steps but never actually written:
- CDMPrivate::getSupportedCapabilitiesForAudioVideoType step 3.11 was
a bare comment - an audio/* MIME type under videoCapabilities (or
vice versa) survived instead of being filtered.
- MockCDMFactory::supportsKeySystem matched case-insensitively; spec
says Key System strings are case-sensitive.
- MediaKeySession::updateExpiration was notImplemented(), so
session.expiration stayed NaN even when a CDM reported an
expiration.
Mock plumbing added to support the new tests: an expirationOnUpdate
attribute the mock returns in the update() callback, a
keyCountForSession(sessionId) introspection method, per-session type
tracking, differentiated closeSession (retains state for
persistent-license), and loadSession restoring stored key statuses.
* Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp:
(WebCore::MediaKeySession::updateExpiration): Implement per spec.
* Source/WebCore/platform/encryptedmedia/CDMPrivate.cpp:
(WebCore::CDMPrivate::getSupportedCapabilitiesForAudioVideoType):
Implement step 3.11 - skip capabilities whose top-level MIME type does
not match the requested audio/video type.
* Source/WebCore/testing/MockCDMFactory.h:
* Source/WebCore/testing/MockCDMFactory.cpp:
(WebCore::MockCDMFactory::supportsKeySystem): Case-sensitive match.
(WebCore::MockCDMFactory::keyCountForSession): New.
(WebCore::MockCDMFactory::sessionType): New.
(WebCore::MockCDMFactory::removeSessionWithID): Also clear session type.
(WebCore::MockCDM::sanitizeSessionId): Accept tracked session IDs so
tests can round-trip close()/load().
(WebCore::MockCDMInstanceSession::requestLicense): Record session type.
(WebCore::MockCDMInstanceSession::updateLicense): Pass expirationOnUpdate
in the callback when set.
(WebCore::MockCDMInstanceSession::loadSession): Return stored key
statuses for tracked sessions.
(WebCore::MockCDMInstanceSession::closeSession): Retain state for
persistent-license sessions.
* Source/WebCore/testing/MockCDMFactory.idl:
Add expirationOnUpdate attribute and keyCountForSession method.
*
LayoutTests/media/encrypted-media/mock-navigator-requestMediaKeySystemAccess.html:
*
LayoutTests/media/encrypted-media/mock-navigator-requestMediaKeySystemAccess-expected.txt:
* LayoutTests/media/encrypted-media/mock-MediaKeySession-invariants.html: Added.
*
LayoutTests/media/encrypted-media/mock-MediaKeySession-invariants-expected.txt:
Added.
* LayoutTests/media/encrypted-media/mock-MediaKeySession-persistence.html:
Added.
*
LayoutTests/media/encrypted-media/mock-MediaKeySession-persistence-expected.txt:
Added.
Canonical link: https://commits.webkit.org/317998@main
To unsubscribe from these emails, change your notification settings at
https://github.com/WebKit/WebKit/settings/notifications
