Title: [153851] trunk
- Revision
- 153851
- Author
- jer.no...@apple.com
- Date
- 2013-08-08 15:29:16 -0700 (Thu, 08 Aug 2013)
Log Message
[EME] setMediaKeys function as defined in the EME specification does not work
https://bugs.webkit.org/show_bug.cgi?id=119597
Reviewed by Anders Carlsson.
Source/WebCore:
No new tests; updated media/encrypted-media/encrypted-media-v2-syntax.html
Rename the mediaKeys attribute 'keys' and make readonly, and add an explicit
setMediaKeys() method in HTMLMediaElement's IDL.
* html/HTMLMediaElement.h:
(WebCore::HTMLMediaElement::keys):
* html/HTMLMediaElement.idl:
LayoutTests:
* media/encrypted-media/encrypted-media-v2-syntax-expected.txt:
* media/encrypted-media/encrypted-media-v2-syntax.html:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (153850 => 153851)
--- trunk/LayoutTests/ChangeLog 2013-08-08 22:01:05 UTC (rev 153850)
+++ trunk/LayoutTests/ChangeLog 2013-08-08 22:29:16 UTC (rev 153851)
@@ -1,3 +1,13 @@
+2013-08-08 Jer Noble <jer.no...@apple.com>
+
+ [EME] setMediaKeys function as defined in the EME specification does not work
+ https://bugs.webkit.org/show_bug.cgi?id=119597
+
+ Reviewed by Anders Carlsson.
+
+ * media/encrypted-media/encrypted-media-v2-syntax-expected.txt:
+ * media/encrypted-media/encrypted-media-v2-syntax.html:
+
2013-08-08 Rob Buis <rwlb...@webkit.org>
ASSERT_NOT_REACHED() touched in WebCore::SVGAnimatedStringAnimator::addAnimatedTypes
Modified: trunk/Source/WebCore/ChangeLog (153850 => 153851)
--- trunk/Source/WebCore/ChangeLog 2013-08-08 22:01:05 UTC (rev 153850)
+++ trunk/Source/WebCore/ChangeLog 2013-08-08 22:29:16 UTC (rev 153851)
@@ -1,3 +1,19 @@
+2013-08-08 Jer Noble <jer.no...@apple.com>
+
+ [EME] setMediaKeys function as defined in the EME specification does not work
+ https://bugs.webkit.org/show_bug.cgi?id=119597
+
+ Reviewed by Anders Carlsson.
+
+ No new tests; updated media/encrypted-media/encrypted-media-v2-syntax.html
+
+ Rename the mediaKeys attribute 'keys' and make readonly, and add an explicit
+ setMediaKeys() method in HTMLMediaElement's IDL.
+
+ * html/HTMLMediaElement.h:
+ (WebCore::HTMLMediaElement::keys):
+ * html/HTMLMediaElement.idl:
+
2013-08-06 Sam Weinig <s...@webkit.org>
Hashing SecurityOrigin's can lead to trouble if you mutate them :(
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (153850 => 153851)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2013-08-08 22:01:05 UTC (rev 153850)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2013-08-08 22:29:16 UTC (rev 153851)
@@ -209,7 +209,7 @@
#endif
#if ENABLE(ENCRYPTED_MEDIA_V2)
- MediaKeys* mediaKeys() const { return m_mediaKeys.get(); }
+ MediaKeys* keys() const { return m_mediaKeys.get(); }
void setMediaKeys(MediaKeys*);
#endif
Modified: trunk/Source/WebCore/html/HTMLMediaElement.idl (153850 => 153851)
--- trunk/Source/WebCore/html/HTMLMediaElement.idl 2013-08-08 22:01:05 UTC (rev 153850)
+++ trunk/Source/WebCore/html/HTMLMediaElement.idl 2013-08-08 22:29:16 UTC (rev 153851)
@@ -105,7 +105,8 @@
#endif
[Conditional=ENCRYPTED_MEDIA|ENCRYPTED_MEDIA_V2] attribute EventListener onwebkitneedkey;
#if defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2
- attribute MediaKeys mediaKeys;
+ readonly attribute MediaKeys keys;
+ void setMediaKeys(MediaKeys mediaKeys);
#endif
#if defined(ENABLE_VIDEO_TRACK) && ENABLE_VIDEO_TRACK
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
