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

Unified Diff: Source/WebKit/chromium/src/WebMediaPlayerClientImpl.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 side-by-side diff with in-line comments
Download patch
Index: Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h
diff --git a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h
index d66a312842adc9e380d9205441f9acd470b5f479..9f93b7276257cc57f0a24584e9b5935fa5e98f42 100644
--- a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h
+++ b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h
@@ -146,11 +146,9 @@ public:
virtual bool supportsAcceleratedRendering() const;
-#if ENABLE(ENCRYPTED_MEDIA)
virtual WebCore::MediaPlayer::MediaKeyException generateKeyRequest(const String& keySystem, const unsigned char* initData, unsigned initDataLength) OVERRIDE;
virtual WebCore::MediaPlayer::MediaKeyException addKey(const String& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const String& sessionId) OVERRIDE;
virtual WebCore::MediaPlayer::MediaKeyException cancelKeyRequest(const String& keySystem, const String& sessionId) OVERRIDE;
-#endif
protected:
WebMediaPlayerClientImpl();
@@ -160,13 +158,8 @@ private:
void loadInternal();
static PassOwnPtr<WebCore::MediaPlayerPrivateInterface> create(WebCore::MediaPlayer*);
-#if ENABLE(ENCRYPTED_MEDIA)
static WebCore::MediaPlayer::SupportsType supportsType(
const WTF::String& type, const WTF::String& codecs, const String& keySystem, const WebCore::KURL&);
-#else
- static WebCore::MediaPlayer::SupportsType supportsType(
- const WTF::String& type, const WTF::String& codecs, const WebCore::KURL&);
-#endif
bool acceleratedRenderingInUse();
#if defined(OS_ANDROID)
« no previous file with comments | « Source/WebKit/chromium/src/AssertMatchingEnums.cpp ('k') | Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698