Title: [221613] trunk/Source/WebCore
- Revision
- 221613
- Author
- [email protected]
- Date
- 2017-09-05 04:29:03 -0700 (Tue, 05 Sep 2017)
Log Message
[EME] HTMLMediaElement: setMediaKeys() should attach CDMInstance from the arriving MediaKeys
https://bugs.webkit.org/show_bug.cgi?id=176352
Reviewed by Xabier Rodriguez-Calvar.
In HTMLMediaElement::setMediaKeys(), use the incoming MediaKeys object
to retrieve the CDMInstance that is then attached to the current
MediaPlayer, if any.
Covered by existing W3C tests that focus on multi-key use cases.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::setMediaKeys):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (221612 => 221613)
--- trunk/Source/WebCore/ChangeLog 2017-09-05 08:20:09 UTC (rev 221612)
+++ trunk/Source/WebCore/ChangeLog 2017-09-05 11:29:03 UTC (rev 221613)
@@ -1,3 +1,19 @@
+2017-09-05 Zan Dobersek <[email protected]>
+
+ [EME] HTMLMediaElement: setMediaKeys() should attach CDMInstance from the arriving MediaKeys
+ https://bugs.webkit.org/show_bug.cgi?id=176352
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ In HTMLMediaElement::setMediaKeys(), use the incoming MediaKeys object
+ to retrieve the CDMInstance that is then attached to the current
+ MediaPlayer, if any.
+
+ Covered by existing W3C tests that focus on multi-key use cases.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::setMediaKeys):
+
2017-09-05 Yoshiaki Jitsukawa <[email protected]>
[Win] Fix the wincairo build after r221558 and r221583
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (221612 => 221613)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-09-05 08:20:09 UTC (rev 221612)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2017-09-05 11:29:03 UTC (rev 221613)
@@ -2639,7 +2639,7 @@
// 5.3.1. Associate the CDM instance represented by mediaKeys with the media element for decrypting media data.
mediaKeys->attachCDMClient(*this);
if (m_player)
- m_player->cdmInstanceAttached(m_mediaKeys->cdmInstance());
+ m_player->cdmInstanceAttached(mediaKeys->cdmInstance());
// 5.3.2. If the preceding step failed, run the following steps:
// 5.3.2.1. Set the mediaKeys attribute to null.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
