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

Unified Diff: Source/core/platform/graphics/ContentDecryptionModule.h

Issue 16387015: Make unprefixed EME APIs use platform and Chromium. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: "unsigned" -> "size_t" for lengths Created 7 years, 6 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/core/platform/graphics/ContentDecryptionModule.h
diff --git a/Source/modules/donottrack/NavigatorDoNotTrack.h b/Source/core/platform/graphics/ContentDecryptionModule.h
similarity index 67%
copy from Source/modules/donottrack/NavigatorDoNotTrack.h
copy to Source/core/platform/graphics/ContentDecryptionModule.h
index 0c044e7cd8edef2f8860c374d59f077e1e963816..3fe04049cfa01c43f71fa272f746f2bda190bc2d 100644
--- a/Source/modules/donottrack/NavigatorDoNotTrack.h
+++ b/Source/core/platform/graphics/ContentDecryptionModule.h
@@ -28,32 +28,35 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef NavigatorDoNotTrack_h
-#define NavigatorDoNotTrack_h
+#ifndef ContentDecryptionModule_h
+#define ContentDecryptionModule_h
-#include "core/page/DOMWindowProperty.h"
-#include "core/platform/Supplementable.h"
+#include "public/platform/WebContentDecryptionModule.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
#include "wtf/text/WTFString.h"
namespace WebCore {
-class Frame;
-class Navigator;
+class ContentDecryptionModuleSession;
+class ContentDecryptionModuleSessionClient;
-class NavigatorDoNotTrack : public Supplement<Navigator>, public DOMWindowProperty {
+class ContentDecryptionModule {
public:
- virtual ~NavigatorDoNotTrack();
- static NavigatorDoNotTrack* from(Navigator*);
+ static bool supportsKeySystem(const String&);
+ static PassOwnPtr<ContentDecryptionModule> create(const String& keySystem);
- static String doNotTrack(Navigator*);
+ ContentDecryptionModule(PassOwnPtr<WebKit::WebContentDecryptionModule>);
+ ~ContentDecryptionModule();
- String doNotTrack();
+ // ContentDecryptionModule
+ bool supportsMIMEType(const String&);
+ PassOwnPtr<ContentDecryptionModuleSession> createSession(ContentDecryptionModuleSessionClient*);
private:
- explicit NavigatorDoNotTrack(Frame*);
- static const char* supplementName();
+ OwnPtr<WebKit::WebContentDecryptionModule> m_cdm;
};
} // namespace WebCore
-#endif // NavigatorDoNotTrack_h
+#endif // ContentDecryptionModule_h

Powered by Google App Engine
This is Rietveld 408576698