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

Unified Diff: Source/modules/encryptedmedia/MediaKeys.cpp

Issue 464353002: Cleanup blink:: prefix usage in Source/core/modules/[battery/*.cpp to indexeddb/*.cpp] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 4 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
Index: Source/modules/encryptedmedia/MediaKeys.cpp
diff --git a/Source/modules/encryptedmedia/MediaKeys.cpp b/Source/modules/encryptedmedia/MediaKeys.cpp
index f8fb73c65f03fe3dc71916a79dc89d29b988a946..a12e1437535da3818a55a1035215dddfa0538645 100644
--- a/Source/modules/encryptedmedia/MediaKeys.cpp
+++ b/Source/modules/encryptedmedia/MediaKeys.cpp
@@ -129,7 +129,7 @@ void MediaKeysInitializer::timerFired(Timer<MediaKeysInitializer>*)
Document* document = toDocument(executionContext());
MediaKeysController* controller = MediaKeysController::from(document->page());
// FIXME: make createContentDecryptionModule() asynchronous.
- OwnPtr<blink::WebContentDecryptionModule> cdm = controller->createContentDecryptionModule(executionContext(), m_keySystem);
+ OwnPtr<WebContentDecryptionModule> cdm = controller->createContentDecryptionModule(executionContext(), m_keySystem);
// 4.3 If cdm fails to load or initialize, reject promise with a new
// DOMException whose name is the appropriate error name and that
@@ -180,7 +180,7 @@ ScriptPromise MediaKeys::create(ScriptState* scriptState, const String& keySyste
return MediaKeysInitializer::create(scriptState, keySystem);
}
-MediaKeys::MediaKeys(ExecutionContext* context, const String& keySystem, PassOwnPtr<blink::WebContentDecryptionModule> cdm)
+MediaKeys::MediaKeys(ExecutionContext* context, const String& keySystem, PassOwnPtr<WebContentDecryptionModule> cdm)
: ContextLifecycleObserver(context)
, m_keySystem(keySystem)
, m_cdm(cdm)
@@ -275,7 +275,7 @@ bool MediaKeys::isTypeSupported(const String& keySystem, const String& contentTy
return isKeySystemSupportedWithContentType(keySystem, contentType);
}
-blink::WebContentDecryptionModule* MediaKeys::contentDecryptionModule()
+WebContentDecryptionModule* MediaKeys::contentDecryptionModule()
{
return m_cdm.get();
}
@@ -292,4 +292,4 @@ void MediaKeys::contextDestroyed()
m_cdm.clear();
}
-}
+} // namespace blink
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeySession.cpp ('k') | Source/modules/encryptedmedia/MediaKeysController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698