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

Side by Side Diff: Source/modules/encryptedmedia/MediaKeys.h

Issue 806653004: Revert "Remove MediaKeys.isTypeSupported()." (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Apple Inc. All rights reserved. 2 * Copyright (C) 2013 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 virtual ~MediaKeys(); 50 virtual ~MediaKeys();
51 51
52 // FIXME: This should be removed after crbug.com/425186 is fully 52 // FIXME: This should be removed after crbug.com/425186 is fully
53 // implemented. 53 // implemented.
54 const String& keySystem() const { return m_keySystem; } 54 const String& keySystem() const { return m_keySystem; }
55 55
56 MediaKeySession* createSession(ScriptState*, const String& sessionType); 56 MediaKeySession* createSession(ScriptState*, const String& sessionType);
57 57
58 ScriptPromise setServerCertificate(ScriptState*, const DOMArrayPiece& server Certificate); 58 ScriptPromise setServerCertificate(ScriptState*, const DOMArrayPiece& server Certificate);
59 59
60 // FIXME: Remove this method since it's not in the spec anymore.
61 static bool isTypeSupported(const String& keySystem, const String& contentTy pe);
62
60 blink::WebContentDecryptionModule* contentDecryptionModule(); 63 blink::WebContentDecryptionModule* contentDecryptionModule();
61 64
62 void trace(Visitor*); 65 void trace(Visitor*);
63 66
64 // ContextLifecycleObserver 67 // ContextLifecycleObserver
65 virtual void contextDestroyed() override; 68 virtual void contextDestroyed() override;
66 69
67 private: 70 private:
68 class PendingAction; 71 class PendingAction;
69 72
70 void timerFired(Timer<MediaKeys>*); 73 void timerFired(Timer<MediaKeys>*);
71 74
72 const String m_keySystem; 75 const String m_keySystem;
73 OwnPtr<blink::WebContentDecryptionModule> m_cdm; 76 OwnPtr<blink::WebContentDecryptionModule> m_cdm;
74 77
75 HeapDeque<Member<PendingAction> > m_pendingActions; 78 HeapDeque<Member<PendingAction> > m_pendingActions;
76 Timer<MediaKeys> m_timer; 79 Timer<MediaKeys> m_timer;
77 }; 80 };
78 81
79 } // namespace blink 82 } // namespace blink
80 83
81 #endif // MediaKeys_h 84 #endif // MediaKeys_h
OLDNEW
« no previous file with comments | « LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html ('k') | Source/modules/encryptedmedia/MediaKeys.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698