Index: Source/core/html/HTMLMediaElement.cpp |
diff --git a/Source/core/html/HTMLMediaElement.cpp b/Source/core/html/HTMLMediaElement.cpp |
index 6588589f64b0ec6f61515869b0e7c8c4a2a64d73..aacd682873b57d0c789a6f1449d3e11cb6001dc9 100644 |
--- a/Source/core/html/HTMLMediaElement.cpp |
+++ b/Source/core/html/HTMLMediaElement.cpp |
@@ -85,11 +85,9 @@ |
#include "modules/webaudio/MediaElementAudioSourceNode.h" |
#endif |
-#if ENABLE(ENCRYPTED_MEDIA_V2) |
// FIXME: Remove dependency on modules/encryptedmedia (http://crbug.com/242754). |
#include "modules/encryptedmedia/MediaKeyNeededEvent.h" |
#include "modules/encryptedmedia/MediaKeys.h" |
abarth-chromium
2013/12/15 06:11:55
Please alphabetize these headers with the rest of
|
-#endif |
using namespace std; |
using blink::WebInbandTextTrack; |
@@ -342,9 +340,7 @@ HTMLMediaElement::~HTMLMediaElement() |
closeMediaSource(); |
-#if ENABLE(ENCRYPTED_MEDIA_V2) |
setMediaKeys(0); |
-#endif |
removeElementFromDocumentMap(this, &document()); |
@@ -1727,7 +1723,6 @@ bool HTMLMediaElement::mediaPlayerKeyNeeded(const String& keySystem, const Strin |
return true; |
} |
-#if ENABLE(ENCRYPTED_MEDIA_V2) |
bool HTMLMediaElement::mediaPlayerKeyNeeded(Uint8Array* initData) |
{ |
if (!hasEventListeners("webkitneedkey")) { |
@@ -1759,7 +1754,6 @@ void HTMLMediaElement::setMediaKeys(MediaKeys* mediaKeys) |
if (m_mediaKeys) |
m_mediaKeys->setMediaElement(this); |
} |
-#endif |
void HTMLMediaElement::progressEventTimerFired(Timer<HTMLMediaElement>*) |
{ |