<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[165643] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/165643">165643</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2014-03-14 13:45:42 -0700 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EME] Extend the lifetime of MediaKeySession.
https://bugs.webkit.org/show_bug.cgi?id=129841
Reviewed by Eric Carlson.
Source/WebCore:
Test: media/encrypted-media/encrypted-media-session-lifetime.html
In anticipation of guidance to be added to the EME Spec <https://www.w3.org/Bugs/Public/show_bug.cgi?id=24771>,
extend the lifetime of MediaKeySession by making the session an ActiveDOMObject, and returning true to
hasPendingActivity when the session is both not closed and is associated with a live MediaKeys object.
Additionally, keep the object from being destroyed while events are pending.
* Modules/encryptedmedia/MediaKeySession.cpp:
(WebCore::MediaKeySession::MediaKeySession):
* Modules/encryptedmedia/MediaKeySession.h:
* Modules/encryptedmedia/MediaKeySession.idl:
LayoutTests:
* media/encrypted-media/encrypted-media-session-lifetime-expected.txt: Added.
* media/encrypted-media/encrypted-media-session-lifetime.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeySessioncpp">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeySessionh">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeySessionidl">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediaencryptedmediaencryptedmediasessionlifetimeexpectedtxt">trunk/LayoutTests/media/encrypted-media/encrypted-media-session-lifetime-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediaencryptedmediaencryptedmediasessionlifetimehtml">trunk/LayoutTests/media/encrypted-media/encrypted-media-session-lifetime.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165642 => 165643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-14 20:43:19 UTC (rev 165642)
+++ trunk/LayoutTests/ChangeLog 2014-03-14 20:45:42 UTC (rev 165643)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-03-14 Jer Noble <jer.noble@apple.com>
+
+ [EME] Extend the lifetime of MediaKeySession.
+ https://bugs.webkit.org/show_bug.cgi?id=129841
+
+ Reviewed by Eric Carlson.
+
+ * media/encrypted-media/encrypted-media-session-lifetime-expected.txt: Added.
+ * media/encrypted-media/encrypted-media-session-lifetime.html: Added.
+
</ins><span class="cx"> 2014-03-11 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Improve dom error messages
</span></span></pre></div>
<a id="trunkLayoutTestsmediaencryptedmediaencryptedmediasessionlifetimeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/encrypted-media/encrypted-media-session-lifetime-expected.txt (0 => 165643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/encrypted-media/encrypted-media-session-lifetime-expected.txt (rev 0)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-session-lifetime-expected.txt 2014-03-14 20:45:42 UTC (rev 165643)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+This tests that the MediaKeySession object is not garbage collected when associated with an open mediaKeys object.
+
+RUN(mediaKeys = new WebKitMediaKeys("com.webcore.mock"))
+RUN(mediaKeySession = mediaKeys.createSession("video/mock", initData))
+RUN(delete mediaKeySession)
+RUN(gc())
+EVENT(webkitkeymessage)
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediaencryptedmediaencryptedmediasessionlifetimehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/encrypted-media/encrypted-media-session-lifetime.html (0 => 165643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/encrypted-media/encrypted-media-session-lifetime.html (rev 0)
+++ trunk/LayoutTests/media/encrypted-media/encrypted-media-session-lifetime.html 2014-03-14 20:45:42 UTC (rev 165643)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>WebKitMediaKeys</title>
+ <script src=../video-test.js></script>
+ <script src=../../resources/gc.js></script>
+ <script>
+ function stringToUint8Array(str)
+ {
+ var arr=[];
+ for(var i=0,j=str.length;i<j;++i)
+ arr[i]=str.charCodeAt(i);
+ return new Uint8Array(arr);
+ }
+
+ var mediaKeys;
+ var mediaKeySession;
+ var initData = stringToUint8Array('mock');
+
+ function runTest()
+ {
+ // Initialize the MockCDM. It supports the key system 'com.apple.mock', the
+ // mime type 'video/mock'. It requires init data to begin with 'mock', and
+ // keys to begin with 'key'.
+ if (internals)
+ internals.initializeMockCDM();
+
+ run('mediaKeys = new WebKitMediaKeys("com.webcore.mock")');
+ run('mediaKeySession = mediaKeys.createSession("video/mock", initData)');
+ run('delete mediaKeySession');
+ run('gc()');
+ waitForEvent('webkitkeymessage', null, true, false, mediaKeySession);
+ }
+
+ </script>
+ </head>
+ <body onload="runTest()">
+ <p>This tests that the MediaKeySession object is not garbage collected when associated with an open mediaKeys object.</p>
+ </body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165642 => 165643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-14 20:43:19 UTC (rev 165642)
+++ trunk/Source/WebCore/ChangeLog 2014-03-14 20:45:42 UTC (rev 165643)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-03-14 Jer Noble <jer.noble@apple.com>
+
+ [EME] Extend the lifetime of MediaKeySession.
+ https://bugs.webkit.org/show_bug.cgi?id=129841
+
+ Reviewed by Eric Carlson.
+
+ Test: media/encrypted-media/encrypted-media-session-lifetime.html
+
+ In anticipation of guidance to be added to the EME Spec <https://www.w3.org/Bugs/Public/show_bug.cgi?id=24771>,
+ extend the lifetime of MediaKeySession by making the session an ActiveDOMObject, and returning true to
+ hasPendingActivity when the session is both not closed and is associated with a live MediaKeys object.
+
+ Additionally, keep the object from being destroyed while events are pending.
+
+ * Modules/encryptedmedia/MediaKeySession.cpp:
+ (WebCore::MediaKeySession::MediaKeySession):
+ * Modules/encryptedmedia/MediaKeySession.h:
+ * Modules/encryptedmedia/MediaKeySession.idl:
+
</ins><span class="cx"> 2014-03-14 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove an unused function fix builds.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp (165642 => 165643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2014-03-14 20:43:19 UTC (rev 165642)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.cpp 2014-03-14 20:45:42 UTC (rev 165643)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaKeySession::MediaKeySession(ScriptExecutionContext* context, MediaKeys* keys, const String& keySystem)
</span><del>- : ContextDestructionObserver(context)
</del><ins>+ : ActiveDOMObject(context)
</ins><span class="cx"> , m_keys(keys)
</span><span class="cx"> , m_keySystem(keySystem)
</span><span class="cx"> , m_asyncEventQueue(*this)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h (165642 => 165643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2014-03-14 20:43:19 UTC (rev 165642)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.h 2014-03-14 20:45:42 UTC (rev 165643)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA_V2)
</span><span class="cx">
</span><del>-#include "ContextDestructionObserver.h"
</del><ins>+#include "ActiveDOMObject.h"
</ins><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "GenericEventQueue.h"
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> class MediaKeys;
</span><span class="cx"> class CDMSession;
</span><span class="cx">
</span><del>-class MediaKeySession final : public RefCounted<MediaKeySession>, public EventTargetWithInlineData, public ContextDestructionObserver {
</del><ins>+class MediaKeySession final : public RefCounted<MediaKeySession>, public EventTargetWithInlineData, public ActiveDOMObject {
</ins><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<MediaKeySession> create(ScriptExecutionContext*, MediaKeys*, const String& keySystem);
</span><span class="cx"> ~MediaKeySession();
</span><span class="lines">@@ -61,6 +61,8 @@
</span><span class="cx">
</span><span class="cx"> void generateKeyRequest(const String& mimeType, Uint8Array* initData);
</span><span class="cx"> void update(Uint8Array* key, ExceptionCode&);
</span><ins>+
+ bool isClosed() const { return !m_session; }
</ins><span class="cx"> void close();
</span><span class="cx">
</span><span class="cx"> using RefCounted<MediaKeySession>::ref;
</span><span class="lines">@@ -68,12 +70,15 @@
</span><span class="cx">
</span><span class="cx"> void enqueueEvent(PassRefPtr<Event>);
</span><span class="cx">
</span><ins>+ // ActiveDOMObject
+ virtual bool hasPendingActivity() const override { return (m_keys && !isClosed()) || m_asyncEventQueue.hasPendingEvents(); }
+
</ins><span class="cx"> DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
</span><span class="cx"> DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
</span><span class="cx"> DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage);
</span><span class="cx">
</span><span class="cx"> virtual EventTargetInterface eventTargetInterface() const override { return MediaKeySessionEventTargetInterfaceType; }
</span><del>- virtual ScriptExecutionContext* scriptExecutionContext() const override { return ContextDestructionObserver::scriptExecutionContext(); }
</del><ins>+ virtual ScriptExecutionContext* scriptExecutionContext() const override { return ActiveDOMObject::scriptExecutionContext(); }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> MediaKeySession(ScriptExecutionContext*, MediaKeys*, const String& keySystem);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySessionidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl (165642 => 165643)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl 2014-03-14 20:43:19 UTC (rev 165642)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySession.idl 2014-03-14 20:45:42 UTC (rev 165643)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> Conditional=ENCRYPTED_MEDIA_V2,
</span><span class="cx"> EventTarget,
</span><span class="cx"> InterfaceName=WebKitMediaKeySession,
</span><ins>+ ActiveDOMObject,
</ins><span class="cx"> ] interface MediaKeySession {
</span><span class="cx"> // error state
</span><span class="cx"> readonly attribute MediaKeyError error;
</span></span></pre>
</div>
</div>
</body>
</html>