Title: [206982] trunk/Source/WebCore
- Revision
- 206982
- Author
- [email protected]
- Date
- 2016-10-09 23:19:12 -0700 (Sun, 09 Oct 2016)
Log Message
Remove stale ENABLE(ENCRYPTED_MEDIA) code in HTMLMediaElement
https://bugs.webkit.org/show_bug.cgi?id=163111
Reviewed by Alex Christensen.
Remove three method implementations in HTMLMediaElement which had their
declarations and the related WebIDL entries removed in the first ENCRYPTED_MEDIA
purge in r206440.
No new tests -- no changes in behavior.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::webkitGenerateKeyRequest): Deleted.
(WebCore::HTMLMediaElement::webkitAddKey): Deleted.
(WebCore::HTMLMediaElement::webkitCancelKeyRequest): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (206981 => 206982)
--- trunk/Source/WebCore/ChangeLog 2016-10-10 05:34:11 UTC (rev 206981)
+++ trunk/Source/WebCore/ChangeLog 2016-10-10 06:19:12 UTC (rev 206982)
@@ -1,3 +1,21 @@
+2016-10-09 Zan Dobersek <[email protected]>
+
+ Remove stale ENABLE(ENCRYPTED_MEDIA) code in HTMLMediaElement
+ https://bugs.webkit.org/show_bug.cgi?id=163111
+
+ Reviewed by Alex Christensen.
+
+ Remove three method implementations in HTMLMediaElement which had their
+ declarations and the related WebIDL entries removed in the first ENCRYPTED_MEDIA
+ purge in r206440.
+
+ No new tests -- no changes in behavior.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::webkitGenerateKeyRequest): Deleted.
+ (WebCore::HTMLMediaElement::webkitAddKey): Deleted.
+ (WebCore::HTMLMediaElement::webkitCancelKeyRequest): Deleted.
+
2016-10-09 Wenson Hsieh <[email protected]>
Support InputEvent.inputType for the new InputEvent spec
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (206981 => 206982)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-10-10 05:34:11 UTC (rev 206981)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-10-10 06:19:12 UTC (rev 206982)
@@ -3240,92 +3240,6 @@
}
#endif
-#if ENABLE(ENCRYPTED_MEDIA)
-void HTMLMediaElement::webkitGenerateKeyRequest(const String& keySystem, const RefPtr<Uint8Array>& initData, ExceptionCode& ec)
-{
-#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
- static bool firstTime = true;
- if (firstTime && scriptExecutionContext()) {
- scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("'HTMLMediaElement.webkitGenerateKeyRequest()' is deprecated. Use 'MediaKeys.createSession()' instead."));
- firstTime = false;
- }
-#endif
-
- if (keySystem.isEmpty()) {
- ec = SYNTAX_ERR;
- return;
- }
-
- if (!m_player) {
- ec = INVALID_STATE_ERR;
- return;
- }
-
- const unsigned char* initDataPointer = nullptr;
- unsigned initDataLength = 0;
- if (initData) {
- initDataPointer = initData->data();
- initDataLength = initData->length();
- }
-
- MediaPlayer::MediaKeyException result = m_player->generateKeyRequest(keySystem, initDataPointer, initDataLength);
- ec = exceptionCodeForMediaKeyException(result);
-}
-
-void HTMLMediaElement::webkitAddKey(const String& keySystem, Uint8Array& key, const RefPtr<Uint8Array>& initData, const String& sessionId, ExceptionCode& ec)
-{
-#if ENABLE(LEGACY_ENCRYPTED_MEDIA)
- static bool firstTime = true;
- if (firstTime && scriptExecutionContext()) {
- scriptExecutionContext()->addConsoleMessage(MessageSource::JS, MessageLevel::Warning, ASCIILiteral("'HTMLMediaElement.webkitAddKey()' is deprecated. Use 'MediaKeySession.update()' instead."));
- firstTime = false;
- }
-#endif
-
- if (keySystem.isEmpty()) {
- ec = SYNTAX_ERR;
- return;
- }
-
- if (!key.length()) {
- ec = TYPE_MISMATCH_ERR;
- return;
- }
-
- if (!m_player) {
- ec = INVALID_STATE_ERR;
- return;
- }
-
- const unsigned char* initDataPointer = nullptr;
- unsigned initDataLength = 0;
- if (initData) {
- initDataPointer = initData->data();
- initDataLength = initData->length();
- }
-
- MediaPlayer::MediaKeyException result = m_player->addKey(keySystem, key.data(), key.length(), initDataPointer, initDataLength, sessionId);
- ec = exceptionCodeForMediaKeyException(result);
-}
-
-void HTMLMediaElement::webkitCancelKeyRequest(const String& keySystem, const String& sessionId, ExceptionCode& ec)
-{
- if (keySystem.isEmpty()) {
- ec = SYNTAX_ERR;
- return;
- }
-
- if (!m_player) {
- ec = INVALID_STATE_ERR;
- return;
- }
-
- MediaPlayer::MediaKeyException result = m_player->cancelKeyRequest(keySystem, sessionId);
- ec = exceptionCodeForMediaKeyException(result);
-}
-
-#endif
-
bool HTMLMediaElement::loop() const
{
return hasAttributeWithoutSynchronization(loopAttr);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
