<!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>[212356] 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/212356">212356</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2017-02-15 03:47:19 -0800 (Wed, 15 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EME] MediaKeys::setServerCertificate() must resolve with 'false' when certificates aren't supported
https://bugs.webkit.org/show_bug.cgi?id=168362
Reviewed by Xabier Rodriguez-Calvar.
Source/WebCore:
In MediaKeys::setServerCertificate(), when the CDM implementation
doesn't support server certificates, it should resolve the promise
with the 'false' value, as mandated by the specification, and not
reject it.
A test case in mock-MediaKeys-setServerCertificate.html is updated.
* Modules/encryptedmedia/MediaKeys.cpp:
(WebCore::MediaKeys::setServerCertificate):
LayoutTests:
Update the certificates-not-supported test case, making sure the promise
is resolved with the 'false' result.
* media/encrypted-media/mock-MediaKeys-setServerCertificate-expected.txt:
* media/encrypted-media/mock-MediaKeys-setServerCertificate.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<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>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesencryptedmediaMediaKeyscpp">trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212355 => 212356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-15 10:00:22 UTC (rev 212355)
+++ trunk/LayoutTests/ChangeLog 2017-02-15 11:47:19 UTC (rev 212356)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-02-15 Zan Dobersek <zdobersek@igalia.com>
+
+ [EME] MediaKeys::setServerCertificate() must resolve with 'false' when certificates aren't supported
+ https://bugs.webkit.org/show_bug.cgi?id=168362
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ Update the certificates-not-supported test case, making sure the promise
+ is resolved with the 'false' result.
+
+ * media/encrypted-media/mock-MediaKeys-setServerCertificate-expected.txt:
+ * media/encrypted-media/mock-MediaKeys-setServerCertificate.html:
+
</ins><span class="cx"> 2017-02-15 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r206014): HTTPHeaderMap does not consistently use comma without space to separate values of header fields
</span></span></pre></div>
<a id="trunkLayoutTestsmediaencryptedmediamockMediaKeyssetServerCertificateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate-expected.txt (212355 => 212356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate-expected.txt 2017-02-15 10:00:22 UTC (rev 212355)
+++ trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate-expected.txt 2017-02-15 11:47:19 UTC (rev 212356)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx">
</span><span class="cx"> RUN(mock.supportsServerCertificates = false)
</span><span class="cx"> RUN(promise = mediaKeys.setServerCertificate(stringToUInt8Array("valid")))
</span><del>-Promise rejected correctly OK
</del><ins>+Promise resolved OK
+EXPECTED (false == 'false') OK
</ins><span class="cx"> END OF TEST
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsmediaencryptedmediamockMediaKeyssetServerCertificatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate.html (212355 => 212356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate.html 2017-02-15 10:00:22 UTC (rev 212355)
+++ trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate.html 2017-02-15 11:47:19 UTC (rev 212356)
</span><span class="lines">@@ -79,7 +79,10 @@
</span><span class="cx"> function() {
</span><span class="cx"> run('mock.supportsServerCertificates = false');
</span><span class="cx"> run('promise = mediaKeys.setServerCertificate(stringToUInt8Array("valid"))');
</span><del>- shouldReject(promise).then(next, next);
</del><ins>+ shouldResolve(promise).then(function(result) {
+ testExpected(result, false);
+ next();
+ }, next);
</ins><span class="cx"> },
</span><span class="cx"> ];
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212355 => 212356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-15 10:00:22 UTC (rev 212355)
+++ trunk/Source/WebCore/ChangeLog 2017-02-15 11:47:19 UTC (rev 212356)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-02-15 Zan Dobersek <zdobersek@igalia.com>
+
+ [EME] MediaKeys::setServerCertificate() must resolve with 'false' when certificates aren't supported
+ https://bugs.webkit.org/show_bug.cgi?id=168362
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ In MediaKeys::setServerCertificate(), when the CDM implementation
+ doesn't support server certificates, it should resolve the promise
+ with the 'false' value, as mandated by the specification, and not
+ reject it.
+
+ A test case in mock-MediaKeys-setServerCertificate.html is updated.
+
+ * Modules/encryptedmedia/MediaKeys.cpp:
+ (WebCore::MediaKeys::setServerCertificate):
+
</ins><span class="cx"> 2017-02-15 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r206014): HTTPHeaderMap does not consistently use comma without space to separate values of header fields
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesencryptedmediaMediaKeyscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp (212355 => 212356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp 2017-02-15 10:00:22 UTC (rev 212355)
+++ trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp 2017-02-15 11:47:19 UTC (rev 212356)
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> // 1. If the Key System implementation represented by this object's cdm implementation value does not support
</span><span class="cx"> // server certificates, return a promise resolved with false.
</span><span class="cx"> if (!m_implementation->supportsServerCertificates()) {
</span><del>- promise->reject(false);
</del><ins>+ promise->resolve<IDLBoolean>(false);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>