<!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>[210549] 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/210549">210549</a></dd>
<dt>Author</dt> <dd>jer.noble@apple.com</dd>
<dt>Date</dt> <dd>2017-01-10 09:25:56 -0800 (Tue, 10 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add support for MediaKeys.setServerCertificate()
https://bugs.webkit.org/show_bug.cgi?id=166772
Reviewed by Darin Adler.
Source/WebCore:
Test: media/encrypted-media/mock-MediaKeys-setServerCertificate.html
Implement MediaKeys::setServerCertificate(). This requires some additions
to CDM, CDMPrivate, and CDMInstance to support platform adoption and to
implement mock support for testing.
* Modules/encryptedmedia/CDM.cpp:
(WebCore::CDM::supportsServerCertificates):
* Modules/encryptedmedia/CDM.h:
* Modules/encryptedmedia/CDMInstance.h:
* Modules/encryptedmedia/CDMPrivate.h:
* Modules/encryptedmedia/MediaKeys.cpp:
(WebCore::MediaKeys::setServerCertificate):
* Modules/encryptedmedia/MediaKeys.h:
* testing/MockCDMFactory.cpp:
(WebCore::MockCDM::supportsServerCertificates):
(WebCore::MockCDMInstance::setServerCertificate):
* testing/MockCDMFactory.h:
(WebCore::MockCDMFactory::supportsServerCertificates):
(WebCore::MockCDMFactory::setSupportsServerCertificates):
* testing/MockCDMFactory.idl:
LayoutTests:
* media/encrypted-media/mock-MediaKeys-setServerCertificate-expected.txt: Added.
* media/encrypted-media/mock-MediaKeys-setServerCertificate.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMcpp">trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMh">trunk/Source/WebCore/Modules/encryptedmedia/CDM.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMInstanceh">trunk/Source/WebCore/Modules/encryptedmedia/CDMInstance.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaCDMPrivateh">trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivate.h</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeySystemAccesscpp">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySystemAccess.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeyscpp">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeysh">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.h</a></li>
<li><a href="#trunkSourceWebCoretestingMockCDMFactorycpp">trunk/Source/WebCore/testing/MockCDMFactory.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingMockCDMFactoryh">trunk/Source/WebCore/testing/MockCDMFactory.h</a></li>
<li><a href="#trunkSourceWebCoretestingMockCDMFactoryidl">trunk/Source/WebCore/testing/MockCDMFactory.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediaencryptedmediamockMediaKeyssetServerCertificateexpectedtxt">trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediaencryptedmediamockMediaKeyssetServerCertificatehtml">trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (210548 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/LayoutTests/ChangeLog 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-01-10 Jer Noble <jer.noble@apple.com>
+
+ Add support for MediaKeys.setServerCertificate()
+ https://bugs.webkit.org/show_bug.cgi?id=166772
+
+ Reviewed by Darin Adler.
+
+ * media/encrypted-media/mock-MediaKeys-setServerCertificate-expected.txt: Added.
+ * media/encrypted-media/mock-MediaKeys-setServerCertificate.html: Added.
+
</ins><span class="cx"> 2017-01-10 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> CachedScript cloning does not clone encodedSize
</span></span></pre></div>
<a id="trunkLayoutTestsmediaencryptedmediamockMediaKeyssetServerCertificateexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate-expected.txt (0 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate-expected.txt (rev 0)
+++ trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate-expected.txt 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+RUN(internals.initializeMockMediaSource())
+RUN(mock = internals.registerMockCDM())
+RUN(mock.supportedDataTypes = ["mock"])
+RUN(capabilities.initDataTypes = ["mock"])
+RUN(capabilities.videoCapabilities = [{ contentType: 'video/mock; codecs="mock"' }] )
+RUN(promise = navigator.requestMediaKeySystemAccess("org.webkit.mock", [capabilities]))
+Promise resolved OK
+
+RUN(promise = mediaKeySystemAccess.createMediaKeys())
+Promise resolved OK
+
+RUN(promise = mediaKeys.setServerCertificate(new ArrayBuffer()))
+Promise rejected correctly OK
+
+RUN(promise = mediaKeys.setServerCertificate(stringToUInt8Array("invalid")))
+Promise rejected correctly OK
+
+RUN(promise = mediaKeys.setServerCertificate(stringToUInt8Array("valid")))
+Promise resolved OK
+
+RUN(mock.supportsServerCertificates = false)
+RUN(promise = mediaKeys.setServerCertificate(stringToUInt8Array("valid")))
+Promise rejected correctly OK
+END OF TEST
+
</ins></span></pre></div>
<a id="trunkLayoutTestsmediaencryptedmediamockMediaKeyssetServerCertificatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate.html (0 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate.html (rev 0)
+++ trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate.html 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -0,0 +1,111 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <script src=../video-test.js></script>
+ <script type="text/javascript">
+ var mock;
+ var promise;
+ var mediaKeySystemAccess;
+ var mediaKeys;
+ var capabilities = {};
+
+ function doTest()
+ {
+ if (!window.internals) {
+ failTest("Internals is required for this test.")
+ return;
+ }
+
+ run('internals.initializeMockMediaSource()');
+ run('mock = internals.registerMockCDM()');
+ run('mock.supportedDataTypes = ["mock"]');
+ run('capabilities.initDataTypes = ["mock"]');
+ run(`capabilities.videoCapabilities = [{ contentType: 'video/mock; codecs="mock"' }] `);
+ run('promise = navigator.requestMediaKeySystemAccess("org.webkit.mock", [capabilities])');
+ promise.then(gotMediaKeySystemAccess).catch(failTest);
+ }
+
+ function next() {
+ if (!tests.length) {
+ mock.unregister();
+ endTest()
+ return;
+ }
+
+ var nextTest = tests.shift();
+ consoleWrite('');
+ nextTest();
+ }
+
+ function shouldResolve(promise) {
+ promise.then(mediaKeySystemAccess => {
+ logResult(Success, 'Promise resolved');
+ next();
+ }, () => {
+ logResult(Failed, 'Promise rejected');
+ next();
+ });
+ }
+
+ function shouldReject(promise) {
+ promise.then(() => {
+ logResult(Failed, 'Promise resolved incorrectly');
+ next();
+ }, exceptionCode => {
+ logResult(Success, 'Promise rejected correctly');
+ next();
+ });
+ }
+
+ function gotMediaKeySystemAccess(result) {
+ logResult(Success, 'Promise resolved');
+ mediaKeySystemAccess = result;
+ next();
+ }
+
+ function gotMediaKeys(result) {
+ logResult(Success, 'Promise resolved');
+ mediaKeys = result;
+ next();
+ }
+
+ function stringToUInt8Array(str)
+ {
+ var array = new Uint8Array(str.length);
+ for (var i=0; i<str.length; i++)
+ array[i] = str.charCodeAt(i);
+ return array;
+ }
+
+ tests = [
+ function() {
+ run('promise = mediaKeySystemAccess.createMediaKeys()');
+ promise.then(gotMediaKeys).catch(failTest);
+ },
+
+ function() {
+ run('promise = mediaKeys.setServerCertificate(new ArrayBuffer())');
+ shouldReject(promise);
+ },
+
+ function() {
+ run('promise = mediaKeys.setServerCertificate(stringToUInt8Array("invalid"))');
+ shouldReject(promise);
+ },
+
+ function() {
+ run('promise = mediaKeys.setServerCertificate(stringToUInt8Array("valid"))');
+ shouldResolve(promise);
+ },
+
+ function() {
+ run('mock.supportsServerCertificates = false');
+ run('promise = mediaKeys.setServerCertificate(stringToUInt8Array("valid"))');
+ shouldReject(promise);
+ },
+ ];
+ </script>
+</head>
+<body onload="doTest()">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (210548 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -1467,6 +1467,7 @@
</span><span class="cx"> # New Encrypted Media API not enabled on Mac
</span><span class="cx"> media/encrypted-media/mock-navigator-requestMediaKeySystemAccess.html [ Skip ]
</span><span class="cx"> media/encrypted-media/mock-MediaKeySystemAccess.html [ Skip ]
</span><ins>+media/encrypted-media/mock-MediaKeys-setServerCertificate.html [ Skip ]
</ins><span class="cx">
</span><span class="cx"> webkit.org/b/166025 http/tests/fetch/fetching-same-resource-with-diffferent-options.html [ Pass Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210548 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/Source/WebCore/ChangeLog 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2017-01-10 Jer Noble <jer.noble@apple.com>
+
+ Add support for MediaKeys.setServerCertificate()
+ https://bugs.webkit.org/show_bug.cgi?id=166772
+
+ Reviewed by Darin Adler.
+
+ Test: media/encrypted-media/mock-MediaKeys-setServerCertificate.html
+
+ Implement MediaKeys::setServerCertificate(). This requires some additions
+ to CDM, CDMPrivate, and CDMInstance to support platform adoption and to
+ implement mock support for testing.
+
+ * Modules/encryptedmedia/CDM.cpp:
+ (WebCore::CDM::supportsServerCertificates):
+ * Modules/encryptedmedia/CDM.h:
+ * Modules/encryptedmedia/CDMInstance.h:
+ * Modules/encryptedmedia/CDMPrivate.h:
+ * Modules/encryptedmedia/MediaKeys.cpp:
+ (WebCore::MediaKeys::setServerCertificate):
+ * Modules/encryptedmedia/MediaKeys.h:
+ * testing/MockCDMFactory.cpp:
+ (WebCore::MockCDM::supportsServerCertificates):
+ (WebCore::MockCDMInstance::setServerCertificate):
+ * testing/MockCDMFactory.h:
+ (WebCore::MockCDMFactory::supportsServerCertificates):
+ (WebCore::MockCDMFactory::setSupportsServerCertificates):
+ * testing/MockCDMFactory.idl:
+
</ins><span class="cx"> 2017-01-10 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> CachedScript cloning does not clone encodedSize
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp (210548 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -624,6 +624,11 @@
</span><span class="cx"> return m_private->createInstance();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool CDM::supportsServerCertificates() const
+{
+ return m_private && m_private->supportsServerCertificates();
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDM.h (210548 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDM.h 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDM.h 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx">
</span><span class="cx"> void loadAndInitialize();
</span><span class="cx"> std::unique_ptr<CDMInstance> createInstance();
</span><ins>+ bool supportsServerCertificates() const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> CDM(Document&, const String& keySystem);
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMInstanceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMInstance.h (210548 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMInstance.h 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMInstance.h 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -29,6 +29,10 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx">
</span><ins>+namespace JSC {
+class ArrayBuffer;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> struct MediaKeySystemConfiguration;
</span><span class="lines">@@ -45,6 +49,7 @@
</span><span class="cx"> virtual SuccessValue initializeWithConfiguration(const MediaKeySystemConfiguration&) = 0;
</span><span class="cx"> virtual SuccessValue setDistinctiveIdentifiersAllowed(bool) = 0;
</span><span class="cx"> virtual SuccessValue setPersistentStateAllowed(bool) = 0;
</span><ins>+ virtual SuccessValue setServerCertificate(JSC::ArrayBuffer&) = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaCDMPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivate.h (210548 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivate.h 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivate.h 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> virtual bool distinctiveIdentifiersAreUniquePerOriginAndClearable(const MediaKeySystemConfiguration&) = 0;
</span><span class="cx"> virtual std::unique_ptr<CDMInstance> createInstance() = 0;
</span><span class="cx"> virtual void loadAndInitialize() = 0;
</span><ins>+ virtual bool supportsServerCertificates() const = 0;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeySystemAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySystemAccess.cpp (210548 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySystemAccess.cpp 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySystemAccess.cpp 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> m_implementation->loadAndInitialize();
</span><span class="cx">
</span><span class="cx"> // 2.5. Let instance be a new instance of the Key System implementation represented by this object's cdm implementation value.
</span><del>- std::unique_ptr<CDMInstance> instance = m_implementation->createInstance();
</del><ins>+ auto instance = m_implementation->createInstance();
</ins><span class="cx"> if (!instance) {
</span><span class="cx"> promise->reject(INVALID_STATE_ERR);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp (210548 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "CDMInstance.h"
</span><span class="cx"> #include "MediaKeySession.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><ins>+#include <runtime/ArrayBuffer.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -55,9 +56,44 @@
</span><span class="cx"> return Exception { NOT_SUPPORTED_ERR };
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaKeys::setServerCertificate(const BufferSource&, Ref<DeferredPromise>&&)
</del><ins>+void MediaKeys::setServerCertificate(const BufferSource& serverCertificate, Ref<DeferredPromise>&& promise)
</ins><span class="cx"> {
</span><del>- notImplemented();
</del><ins>+ // https://w3c.github.io/encrypted-media/#dom-mediakeys-setservercertificate
+ // W3C Editor's Draft 09 November 2016
+
+ // When this method is invoked, the user agent must run the following steps:
+ // 1. If the Key System implementation represented by this object's cdm implementation value does not support
+ // server certificates, return a promise resolved with false.
+ if (!m_implementation->supportsServerCertificates()) {
+ promise->reject(false);
+ return;
+ }
+
+ // 2. If serverCertificate is an empty array, return a promise rejected with a new a newly created TypeError.
+ if (!serverCertificate.length()) {
+ promise->reject(TypeError);
+ return;
+ }
+
+ // 3. Let certificate be a copy of the contents of the serverCertificate parameter.
+ auto certificate = ArrayBuffer::create(serverCertificate.data(), serverCertificate.length());
+
+ // 4. Let promise be a new promise.
+ // 5. Run the following steps in parallel:
+
+ m_taskQueue.enqueueTask([this, certificate = WTFMove(certificate), promise = WTFMove(promise)] () mutable {
+ // 5.1. Use this object's cdm instance to process certificate.
+ if (m_instance->setServerCertificate(certificate) == CDMInstance::Failed) {
+ // 5.2. If the preceding step failed, resolve promise with a new DOMException whose name is the appropriate error name.
+ promise->reject(INVALID_STATE_ERR);
+ return;
+ }
+
+ // 5.1. Resolve promise with true.
+ promise->resolve<IDLBoolean>(true);
+ });
+
+ // 6. Return promise.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeysh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.h (210548 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.h 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.h 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA)
</span><span class="cx">
</span><span class="cx"> #include "ExceptionOr.h"
</span><ins>+#include "GenericTaskQueue.h"
</ins><span class="cx"> #include "JSDOMPromise.h"
</span><span class="cx"> #include "MediaKeySessionType.h"
</span><span class="cx"> #include <wtf/Ref.h>
</span><span class="lines">@@ -66,6 +67,7 @@
</span><span class="cx"> Vector<MediaKeySessionType> m_supportedSessionTypes;
</span><span class="cx"> Ref<CDM> m_implementation;
</span><span class="cx"> std::unique_ptr<CDMInstance> m_instance;
</span><ins>+ GenericTaskQueue<Timer> m_taskQueue;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockCDMFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockCDMFactory.cpp (210548 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockCDMFactory.cpp 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/Source/WebCore/testing/MockCDMFactory.cpp 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -28,7 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ENCRYPTED_MEDIA)
</span><span class="cx">
</span><del>-#include <wtf/NeverDestroyed.h>
</del><ins>+#include <runtime/ArrayBuffer.h>
+#include <wtf/text/StringView.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -132,6 +133,11 @@
</span><span class="cx"> // No-op.
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MockCDM::supportsServerCertificates() const
+{
+ return m_factory && m_factory->supportsServerCertificates();
+}
+
</ins><span class="cx"> MockCDMInstance::MockCDMInstance(WeakPtr<MockCDM> cdm)
</span><span class="cx"> : m_cdm(cdm)
</span><span class="cx"> {
</span><span class="lines">@@ -150,7 +156,7 @@
</span><span class="cx"> if (m_distinctiveIdentifiersAllowed == distinctiveIdentifiersAllowed)
</span><span class="cx"> return Succeeded;
</span><span class="cx">
</span><del>- MockCDMFactory* factory = m_cdm ? m_cdm->factory() : nullptr;
</del><ins>+ auto* factory = m_cdm ? m_cdm->factory() : nullptr;
</ins><span class="cx">
</span><span class="cx"> if (!factory || (!distinctiveIdentifiersAllowed && factory->distinctiveIdentifiersRequirement() == MediaKeysRequirement::Required))
</span><span class="cx"> return Failed;
</span><span class="lines">@@ -173,6 +179,15 @@
</span><span class="cx"> return Succeeded;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+CDMInstance::SuccessValue MockCDMInstance::setServerCertificate(ArrayBuffer& certificate)
+{
+ StringView certificateStringView(static_cast<const LChar*>(certificate.data()), certificate.byteLength());
+
+ if (equalIgnoringASCIICase(certificateStringView, "valid"))
+ return Succeeded;
+ return Failed;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockCDMFactoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockCDMFactory.h (210548 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockCDMFactory.h 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/Source/WebCore/testing/MockCDMFactory.h 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -57,6 +57,9 @@
</span><span class="cx"> bool canCreateInstances() const { return m_canCreateInstances; }
</span><span class="cx"> void setCanCreateInstances(bool flag) { m_canCreateInstances = flag; }
</span><span class="cx">
</span><ins>+ bool supportsServerCertificates() const { return m_supportsServerCertificates; }
+ void setSupportsServerCertificates(bool flag) { m_supportsServerCertificates = flag; }
+
</ins><span class="cx"> void unregister();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -70,6 +73,7 @@
</span><span class="cx"> Vector<String> m_supportedRobustness;
</span><span class="cx"> bool m_registered { true };
</span><span class="cx"> bool m_canCreateInstances { true };
</span><ins>+ bool m_supportsServerCertificates { true };
</ins><span class="cx"> WeakPtrFactory<MockCDMFactory> m_weakPtrFactory;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -92,6 +96,7 @@
</span><span class="cx"> bool distinctiveIdentifiersAreUniquePerOriginAndClearable(const MediaKeySystemConfiguration&) final;
</span><span class="cx"> std::unique_ptr<CDMInstance> createInstance() final;
</span><span class="cx"> void loadAndInitialize() final;
</span><ins>+ bool supportsServerCertificates() const final;
</ins><span class="cx">
</span><span class="cx"> WeakPtr<MockCDMFactory> m_factory;
</span><span class="cx"> WeakPtrFactory<MockCDM> m_weakPtrFactory;
</span><span class="lines">@@ -105,6 +110,7 @@
</span><span class="cx"> SuccessValue initializeWithConfiguration(const MediaKeySystemConfiguration&) final;
</span><span class="cx"> SuccessValue setDistinctiveIdentifiersAllowed(bool) final;
</span><span class="cx"> SuccessValue setPersistentStateAllowed(bool) final;
</span><ins>+ SuccessValue setServerCertificate(JSC::ArrayBuffer&) final;
</ins><span class="cx">
</span><span class="cx"> WeakPtr<MockCDM> m_cdm;
</span><span class="cx"> bool m_distinctiveIdentifiersAllowed { true };
</span></span></pre></div>
<a id="trunkSourceWebCoretestingMockCDMFactoryidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/MockCDMFactory.idl (210548 => 210549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/MockCDMFactory.idl 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/Source/WebCore/testing/MockCDMFactory.idl 2017-01-10 17:25:56 UTC (rev 210549)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> attribute MediaKeysRequirement distinctiveIdentifiersRequirement;
</span><span class="cx"> attribute MediaKeysRequirement persistentStateRequirement;
</span><span class="cx"> attribute boolean canCreateInstances;
</span><ins>+ attribute boolean supportsServerCertificates;
</ins><span class="cx">
</span><span class="cx"> void unregister();
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>