Skip to content

[EME] Fix logging inside requestMediaKeySystemAccess() flow #1642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
asurdej-comcast wants to merge 1 commit into
base: wpe-2.46
Choose a base branch
from
Open

[EME] Fix logging inside requestMediaKeySystemAccess() flow #1642

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/WebCore/Modules/encryptedmedia/NavigatorEME.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ template<typename T>
struct LogArgument<std::optional<T>> {
static String toString(const std::optional<T>& value)
{
return value ? "nullopt"_s : LogArgument<T>::toString(value.value());
return value ? LogArgument<T>::toString(value.value()) : "nullopt"_s;
}
};

Expand Down Expand Up @@ -153,10 +153,10 @@ static void tryNextSupportedConfiguration(Document& document, RefPtr<CDM>&& impl

// Obtain reference to the key system string before the `implementation` RefPtr<> is cleared out.
const String& keySystem = implementation->keySystem();
infoLog(logger, identifier, "Resolved: keySystem(", keySystem, "), supportedConfiguration(", supportedConfiguration, ")");
auto access = MediaKeySystemAccess::create(document, keySystem, WTFMove(supportedConfiguration.value()), implementation.releaseNonNull());

// 6.3.3.2. Resolve promise with access and abort the parallel steps of this algorithm.
infoLog(logger, identifier, "Resolved: keySystem(", keySystem, "), supportedConfiguration(", supportedConfiguration, ")");
promise->resolveWithNewlyCreated<IDLInterface<MediaKeySystemAccess>>(WTFMove(access));
return;
}
Expand Down