Title: [153862] tags/Safari-537.55.1

Diff

Modified: tags/Safari-537.55.1/LayoutTests/ChangeLog (153861 => 153862)


--- tags/Safari-537.55.1/LayoutTests/ChangeLog	2013-08-08 23:41:38 UTC (rev 153861)
+++ tags/Safari-537.55.1/LayoutTests/ChangeLog	2013-08-08 23:47:01 UTC (rev 153862)
@@ -1,5 +1,19 @@
 2013-08-08  Lucas Forschler  <[email protected]>
 
+        Merge r153851
+
+    2013-08-08  Jer Noble  <[email protected]>
+
+            [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  Lucas Forschler  <[email protected]>
+
         Merge r153838
 
     2013-08-08  Jer Noble  <[email protected]>

Modified: tags/Safari-537.55.1/Source/WebCore/ChangeLog (153861 => 153862)


--- tags/Safari-537.55.1/Source/WebCore/ChangeLog	2013-08-08 23:41:38 UTC (rev 153861)
+++ tags/Safari-537.55.1/Source/WebCore/ChangeLog	2013-08-08 23:47:01 UTC (rev 153862)
@@ -1,5 +1,25 @@
 2013-08-08  Lucas Forschler  <[email protected]>
 
+        Merge r153851
+
+    2013-08-08  Jer Noble  <[email protected]>
+
+            [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-08  Lucas Forschler  <[email protected]>
+
         Merge r153838
 
     2013-08-08  Jer Noble  <[email protected]>

Modified: tags/Safari-537.55.1/Source/WebCore/html/HTMLMediaElement.h (153861 => 153862)


--- tags/Safari-537.55.1/Source/WebCore/html/HTMLMediaElement.h	2013-08-08 23:41:38 UTC (rev 153861)
+++ tags/Safari-537.55.1/Source/WebCore/html/HTMLMediaElement.h	2013-08-08 23:47:01 UTC (rev 153862)
@@ -213,7 +213,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: tags/Safari-537.55.1/Source/WebCore/html/HTMLMediaElement.idl (153861 => 153862)


--- tags/Safari-537.55.1/Source/WebCore/html/HTMLMediaElement.idl	2013-08-08 23:41:38 UTC (rev 153861)
+++ tags/Safari-537.55.1/Source/WebCore/html/HTMLMediaElement.idl	2013-08-08 23:47:01 UTC (rev 153862)
@@ -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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to