Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(963)

Unified Diff: third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp

Issue 2001173002: encryptedmedia: Replace wtf/Assertions.h macros in favor of base/logging.h macros (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
diff --git a/third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp b/third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
index 7f69eda5627dc574eee438ed43365351e18c0330..dd0af18ce742487757ffdfd0e13a7686731c49b4 100644
--- a/third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
+++ b/third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp
@@ -67,7 +67,7 @@ static WebMediaKeySystemConfiguration::Requirement convertMediaKeysRequirement(c
return WebMediaKeySystemConfiguration::Requirement::NotAllowed;
// Everything else gets the default value.
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return WebMediaKeySystemConfiguration::Requirement::Optional;
}
@@ -147,9 +147,9 @@ MediaKeySystemAccessInitializer::MediaKeySystemAccessInitializer(ScriptState* sc
webConfig.hasVideoCapabilities = true;
webConfig.videoCapabilities = convertCapabilities(config.videoCapabilities());
}
- ASSERT(config.hasDistinctiveIdentifier());
+ DCHECK(config.hasDistinctiveIdentifier());
webConfig.distinctiveIdentifier = convertMediaKeysRequirement(config.distinctiveIdentifier());
- ASSERT(config.hasPersistentState());
+ DCHECK(config.hasPersistentState());
webConfig.persistentState = convertMediaKeysRequirement(config.persistentState());
if (config.hasSessionTypes()) {
webConfig.hasSessionTypes = true;
@@ -250,7 +250,7 @@ ScriptPromise NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess(
const String& keySystem,
const HeapVector<MediaKeySystemConfiguration>& supportedConfigurations)
{
- WTF_LOG(Media, "NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess()");
+ DVLOG(3) << __FUNCTION__;
// From https://w3c.github.io/encrypted-media/#requestMediaKeySystemAccess
// When this method is invoked, the user agent must run the following steps:
« no previous file with comments | « third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698