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

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

Issue 186093003: Remove platform/drm files. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 10 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.h
diff --git a/Source/modules/encryptedmedia/MediaKeys.h b/Source/modules/encryptedmedia/MediaKeys.h
index 4915637b362687d2afba6c34a4955d7eb675720e..e66d4f025b806b16e82f1fc7632fb931e3680269 100644
--- a/Source/modules/encryptedmedia/MediaKeys.h
+++ b/Source/modules/encryptedmedia/MediaKeys.h
@@ -47,12 +47,11 @@ class WebContentDecryptionModule;
namespace WebCore {
-class ContentDecryptionModule;
class HTMLMediaElement;
class ExceptionState;
// References are held by JS and HTMLMediaElement.
-// The ContentDecryptionModule has the same lifetime as this object.
+// The WebContentDecryptionModule has the same lifetime as this object.
class MediaKeys : public RefCountedWillBeGarbageCollectedFinalized<MediaKeys>, public ContextLifecycleObserver, public ScriptWrappable {
public:
static PassRefPtrWillBeRawPtr<MediaKeys> create(ExecutionContext*, const String& keySystem, ExceptionState&);
@@ -74,12 +73,12 @@ public:
virtual void contextDestroyed() OVERRIDE;
protected:
- MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<ContentDecryptionModule>);
+ MediaKeys(ExecutionContext*, const String& keySystem, PassOwnPtr<blink::WebContentDecryptionModule>);
void initializeNewSessionTimerFired(Timer<MediaKeys>*);
HTMLMediaElement* m_mediaElement;
const String m_keySystem;
- OwnPtr<ContentDecryptionModule> m_cdm;
+ OwnPtr<blink::WebContentDecryptionModule> m_cdm;
// FIXME: Check whether |initData| can be changed by JS. Maybe we should not pass it as a pointer.
struct InitializeNewSessionData {

Powered by Google App Engine
This is Rietveld 408576698