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

Unified Diff: Source/platform/graphics/media/MediaPlayer.h

Issue 157423003: Remove the dependency on encryptedmedia from HTMLMediaElement. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix compilation error on linux Created 6 years, 9 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/modules/modules.gypi ('k') | Source/web/AssertMatchingEnums.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/graphics/media/MediaPlayer.h
diff --git a/Source/platform/graphics/media/MediaPlayer.h b/Source/platform/graphics/media/MediaPlayer.h
index 7a66dfc7dbb74557a5b7ade7c0c8d0445c8f6e18..c5cc4c54f3aefb6f64b9fbc85e5c070a98afb950 100644
--- a/Source/platform/graphics/media/MediaPlayer.h
+++ b/Source/platform/graphics/media/MediaPlayer.h
@@ -92,12 +92,6 @@ public:
// the movie size has changed
virtual void mediaPlayerSizeChanged() = 0;
- enum MediaKeyErrorCode { UnknownError = 1, ClientError, ServiceError, OutputError, HardwareChangeError, DomainError };
- virtual void mediaPlayerKeyAdded(const String& /* keySystem */, const String& /* sessionId */) = 0;
- virtual void mediaPlayerKeyError(const String& /* keySystem */, const String& /* sessionId */, MediaKeyErrorCode, unsigned short /* systemCode */) = 0;
- virtual void mediaPlayerKeyMessage(const String& /* keySystem */, const String& /* sessionId */, const unsigned char* /* message */, unsigned /* messageLength */, const KURL& /* defaultURL */) = 0;
- virtual bool mediaPlayerKeyNeeded(const String& /* contentType */, const unsigned char* /* initData */, unsigned /* initDataLength */) = 0;
-
virtual CORSMode mediaPlayerCORSMode() const = 0;
virtual void mediaPlayerSetWebLayer(blink::WebLayer*) = 0;
@@ -191,12 +185,7 @@ public:
#if ENABLE(WEB_AUDIO)
virtual AudioSourceProvider* audioSourceProvider() = 0;
#endif
-
- enum MediaKeyException { NoError, InvalidPlayerState, KeySystemNotSupported, InvalidAccess };
- virtual MediaKeyException addKey(const String&, const unsigned char*, unsigned, const unsigned char*, unsigned, const String&) = 0;
- virtual MediaKeyException generateKeyRequest(const String&, const unsigned char*, unsigned) = 0;
- virtual MediaKeyException cancelKeyRequest(const String&, const String&) = 0;
- virtual void setContentDecryptionModule(blink::WebContentDecryptionModule*) = 0;
+ virtual blink::WebMediaPlayer* webMediaPlayer() const = 0;
};
}
« no previous file with comments | « Source/modules/modules.gypi ('k') | Source/web/AssertMatchingEnums.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698