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

Unified Diff: Source/core/html/HTMLMediaElement.cpp

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
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/HTMLMediaElement.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/HTMLMediaElement.cpp
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp
index 69884e7906c2a03a03a361871fe279d38d14e820..00bd037947de43daed32e2d5551bac66332d6cdf 100644
--- a/Source/core/html/HTMLMediaElement.cpp
+++ b/Source/core/html/HTMLMediaElement.cpp
@@ -171,7 +171,6 @@ static void removeElementFromDocumentMap(HTMLMediaElement* element, Document* do
map.add(document, set);
}
-#if ENABLE(ENCRYPTED_MEDIA)
static ExceptionCode exceptionCodeForMediaKeyException(MediaPlayer::MediaKeyException exception)
{
switch (exception) {
@@ -186,7 +185,6 @@ static ExceptionCode exceptionCodeForMediaKeyException(MediaPlayer::MediaKeyExce
ASSERT_NOT_REACHED();
return INVALID_STATE_ERR;
}
-#endif
class TrackDisplayUpdateScope {
public:
@@ -1631,7 +1629,6 @@ void HTMLMediaElement::setReadyState(MediaPlayer::ReadyState state)
updateActiveTextTrackCues(currentTime());
}
-#if ENABLE(ENCRYPTED_MEDIA)
void HTMLMediaElement::mediaPlayerKeyAdded(MediaPlayer*, const String& keySystem, const String& sessionId)
{
MediaKeyEventInit initializer;
@@ -1717,7 +1714,6 @@ bool HTMLMediaElement::mediaPlayerKeyNeeded(MediaPlayer*, const String& keySyste
m_asyncEventQueue->enqueueEvent(event.release());
return true;
}
-#endif
#if ENABLE(ENCRYPTED_MEDIA_V2)
bool HTMLMediaElement::mediaPlayerKeyNeeded(MediaPlayer*, Uint8Array* initData)
@@ -2250,7 +2246,6 @@ void HTMLMediaElement::closeMediaSource()
m_mediaSource = 0;
}
-#if ENABLE(ENCRYPTED_MEDIA)
void HTMLMediaElement::webkitGenerateKeyRequest(const String& keySystem, PassRefPtr<Uint8Array> initData, ExceptionCode& ec)
{
if (keySystem.isEmpty()) {
@@ -2333,8 +2328,6 @@ void HTMLMediaElement::webkitCancelKeyRequest(const String& keySystem, const Str
ec = exceptionCodeForMediaKeyException(result);
}
-#endif
-
bool HTMLMediaElement::loop() const
{
return fastHasAttribute(loopAttr);
« no previous file with comments | « Source/core/html/HTMLMediaElement.h ('k') | Source/core/html/HTMLMediaElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698