Source/core/platform/graphics/MediaPlayerPrivate.h - Issue 15178010: Remove ENABLE_ENCRYPTED_MEDIA #define as it's always enabled

Side by Side Diff: Source/core/platform/graphics/MediaPlayerPrivate.h

Issue 15178010: Remove ENABLE_ENCRYPTED_MEDIA #define as it's always enabled (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « Source/core/platform/graphics/MediaPlayer.cpp ('k') | Source/core/testing/MockCDM.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.	2 * Copyright (C) 2009, 2010, 2011, 2012, 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 132 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
143	143

144 virtual unsigned decodedFrameCount() const { return 0; }	144 virtual unsigned decodedFrameCount() const { return 0; }

145 virtual unsigned droppedFrameCount() const { return 0; }	145 virtual unsigned droppedFrameCount() const { return 0; }

146 virtual unsigned audioDecodedByteCount() const { return 0; }	146 virtual unsigned audioDecodedByteCount() const { return 0; }

147 virtual unsigned videoDecodedByteCount() const { return 0; }	147 virtual unsigned videoDecodedByteCount() const { return 0; }

148	148

149 #if ENABLE(WEB_AUDIO)	149 #if ENABLE(WEB_AUDIO)

150 virtual AudioSourceProvider* audioSourceProvider() { return 0; }	150 virtual AudioSourceProvider* audioSourceProvider() { return 0; }

151 #endif	151 #endif

152	152

153 #if ENABLE(ENCRYPTED_MEDIA)

154 virtual MediaPlayer::MediaKeyException addKey(const String&, const unsigned char, unsigned, const unsigned char, unsigned, const String&) { return MediaPl ayer::KeySystemNotSupported; }	153 virtual MediaPlayer::MediaKeyException addKey(const String&, const unsigned char, unsigned, const unsigned char, unsigned, const String&) { return MediaPl ayer::KeySystemNotSupported; }

155 virtual MediaPlayer::MediaKeyException generateKeyRequest(const String&, con st unsigned char*, unsigned) { return MediaPlayer::KeySystemNotSupported; }	154 virtual MediaPlayer::MediaKeyException generateKeyRequest(const String&, con st unsigned char*, unsigned) { return MediaPlayer::KeySystemNotSupported; }

156 virtual MediaPlayer::MediaKeyException cancelKeyRequest(const String&, const String&) { return MediaPlayer::KeySystemNotSupported; }	155 virtual MediaPlayer::MediaKeyException cancelKeyRequest(const String&, const String&) { return MediaPlayer::KeySystemNotSupported; }

157 #endif

158	156

159 virtual bool requiresTextTrackRepresentation() const { return false; }	157 virtual bool requiresTextTrackRepresentation() const { return false; }

160 virtual void setTextTrackRepresentation(TextTrackRepresentation*) { }	158 virtual void setTextTrackRepresentation(TextTrackRepresentation*) { }

161 };	159 };

162	160

163 }	161 }

164	162

165 #endif	163 #endif

OLD	NEW