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

Unified Diff: Source/bindings/v8/Dictionary.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/bindings/v8/Dictionary.h ('k') | Source/core/dom/EventNames.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/v8/Dictionary.cpp
diff --git a/Source/bindings/v8/Dictionary.cpp b/Source/bindings/v8/Dictionary.cpp
index 66a5bb5edbce16193adddcdb5fc153aeff46defe..8119179d2356ee49599a56a7ac38709532de7eb5 100644
--- a/Source/bindings/v8/Dictionary.cpp
+++ b/Source/bindings/v8/Dictionary.cpp
@@ -32,6 +32,7 @@
#include "V8EventTarget.h"
#include "V8IDBKeyRange.h"
#include "V8MIDIPort.h"
+#include "V8MediaKeyError.h"
#include "V8SpeechRecognitionError.h"
#include "V8SpeechRecognitionResult.h"
#include "V8SpeechRecognitionResultList.h"
@@ -48,10 +49,6 @@
#include "modules/speech/SpeechRecognitionResultList.h"
#include "wtf/MathExtras.h"
-#if ENABLE(ENCRYPTED_MEDIA)
-#include "V8MediaKeyError.h"
-#endif
-
#include "V8TextTrack.h"
#include "core/html/track/TrackBase.h"
@@ -342,7 +339,6 @@ bool Dictionary::get(const String& key, RefPtr<MIDIPort>& value) const
return true;
}
-#if ENABLE(ENCRYPTED_MEDIA)
bool Dictionary::get(const String& key, RefPtr<MediaKeyError>& value) const
{
v8::Local<v8::Value> v8Value;
@@ -354,7 +350,6 @@ bool Dictionary::get(const String& key, RefPtr<MediaKeyError>& value) const
value = V8MediaKeyError::toNative(v8::Handle<v8::Object>::Cast(v8Value));
return true;
}
-#endif
bool Dictionary::get(const String& key, RefPtr<TrackBase>& value) const
{
« no previous file with comments | « Source/bindings/v8/Dictionary.h ('k') | Source/core/dom/EventNames.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698