Diff
Modified: trunk/LayoutTests/ChangeLog (210548 => 210549)
--- trunk/LayoutTests/ChangeLog 2017-01-10 17:18:51 UTC (rev 210548)
+++ trunk/LayoutTests/ChangeLog 2017-01-10 17:25:56 UTC (rev 210549)
@@ -1,3 +1,13 @@
+2017-01-10 Jer Noble <[email protected]>
+
+ 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.
+
2017-01-10 Youenn Fablet <[email protected]>
CachedScript cloning does not clone encodedSize
Added: trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate-expected.txt (0 => 210549)
--- 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)
@@ -0,0 +1,25 @@
+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
+
Added: trunk/LayoutTests/media/encrypted-media/mock-MediaKeys-setServerCertificate.html (0 => 210549)
--- 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)
@@ -0,0 +1,111 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <script src=""
+ <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>
Modified: trunk/LayoutTests/platform/mac/TestExpectations (210548 => 210549)
--- 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)
@@ -1467,6 +1467,7 @@
# New Encrypted Media API not enabled on Mac
media/encrypted-media/mock-navigator-requestMediaKeySystemAccess.html [ Skip ]
media/encrypted-media/mock-MediaKeySystemAccess.html [ Skip ]
+media/encrypted-media/mock-MediaKeys-setServerCertificate.html [ Skip ]
webkit.org/b/166025 http/tests/fetch/fetching-same-resource-with-diffferent-options.html [ Pass Failure ]
Modified: trunk/Source/WebCore/ChangeLog (210548 => 210549)
--- 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)
@@ -1,3 +1,32 @@
+2017-01-10 Jer Noble <[email protected]>
+
+ 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:
+
2017-01-10 Youenn Fablet <[email protected]>
CachedScript cloning does not clone encodedSize
Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDM.cpp (210548 => 210549)
--- 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)
@@ -624,6 +624,11 @@
return m_private->createInstance();
}
+bool CDM::supportsServerCertificates() const
+{
+ return m_private && m_private->supportsServerCertificates();
}
+}
+
#endif
Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDM.h (210548 => 210549)
--- 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)
@@ -71,6 +71,7 @@
void loadAndInitialize();
std::unique_ptr<CDMInstance> createInstance();
+ bool supportsServerCertificates() const;
private:
CDM(Document&, const String& keySystem);
Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMInstance.h (210548 => 210549)
--- 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)
@@ -29,6 +29,10 @@
#include <wtf/Forward.h>
+namespace JSC {
+class ArrayBuffer;
+}
+
namespace WebCore {
struct MediaKeySystemConfiguration;
@@ -45,6 +49,7 @@
virtual SuccessValue initializeWithConfiguration(const MediaKeySystemConfiguration&) = 0;
virtual SuccessValue setDistinctiveIdentifiersAllowed(bool) = 0;
virtual SuccessValue setPersistentStateAllowed(bool) = 0;
+ virtual SuccessValue setServerCertificate(JSC::ArrayBuffer&) = 0;
};
}
Modified: trunk/Source/WebCore/Modules/encryptedmedia/CDMPrivate.h (210548 => 210549)
--- 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)
@@ -51,6 +51,7 @@
virtual bool distinctiveIdentifiersAreUniquePerOriginAndClearable(const MediaKeySystemConfiguration&) = 0;
virtual std::unique_ptr<CDMInstance> createInstance() = 0;
virtual void loadAndInitialize() = 0;
+ virtual bool supportsServerCertificates() const = 0;
};
}
Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeySystemAccess.cpp (210548 => 210549)
--- 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)
@@ -74,7 +74,7 @@
m_implementation->loadAndInitialize();
// 2.5. Let instance be a new instance of the Key System implementation represented by this object's cdm implementation value.
- std::unique_ptr<CDMInstance> instance = m_implementation->createInstance();
+ auto instance = m_implementation->createInstance();
if (!instance) {
promise->reject(INVALID_STATE_ERR);
return;
Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.cpp (210548 => 210549)
--- 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)
@@ -35,6 +35,7 @@
#include "CDMInstance.h"
#include "MediaKeySession.h"
#include "NotImplemented.h"
+#include <runtime/ArrayBuffer.h>
namespace WebCore {
@@ -55,9 +56,44 @@
return Exception { NOT_SUPPORTED_ERR };
}
-void MediaKeys::setServerCertificate(const BufferSource&, Ref<DeferredPromise>&&)
+void MediaKeys::setServerCertificate(const BufferSource& serverCertificate, Ref<DeferredPromise>&& promise)
{
- notImplemented();
+ // 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.
}
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/encryptedmedia/MediaKeys.h (210548 => 210549)
--- 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)
@@ -31,6 +31,7 @@
#if ENABLE(ENCRYPTED_MEDIA)
#include "ExceptionOr.h"
+#include "GenericTaskQueue.h"
#include "JSDOMPromise.h"
#include "MediaKeySessionType.h"
#include <wtf/Ref.h>
@@ -66,6 +67,7 @@
Vector<MediaKeySessionType> m_supportedSessionTypes;
Ref<CDM> m_implementation;
std::unique_ptr<CDMInstance> m_instance;
+ GenericTaskQueue<Timer> m_taskQueue;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/testing/MockCDMFactory.cpp (210548 => 210549)
--- 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)
@@ -28,7 +28,8 @@
#if ENABLE(ENCRYPTED_MEDIA)
-#include <wtf/NeverDestroyed.h>
+#include <runtime/ArrayBuffer.h>
+#include <wtf/text/StringView.h>
namespace WebCore {
@@ -132,6 +133,11 @@
// No-op.
}
+bool MockCDM::supportsServerCertificates() const
+{
+ return m_factory && m_factory->supportsServerCertificates();
+}
+
MockCDMInstance::MockCDMInstance(WeakPtr<MockCDM> cdm)
: m_cdm(cdm)
{
@@ -150,7 +156,7 @@
if (m_distinctiveIdentifiersAllowed == distinctiveIdentifiersAllowed)
return Succeeded;
- MockCDMFactory* factory = m_cdm ? m_cdm->factory() : nullptr;
+ auto* factory = m_cdm ? m_cdm->factory() : nullptr;
if (!factory || (!distinctiveIdentifiersAllowed && factory->distinctiveIdentifiersRequirement() == MediaKeysRequirement::Required))
return Failed;
@@ -173,6 +179,15 @@
return Succeeded;
}
+CDMInstance::SuccessValue MockCDMInstance::setServerCertificate(ArrayBuffer& certificate)
+{
+ StringView certificateStringView(static_cast<const LChar*>(certificate.data()), certificate.byteLength());
+
+ if (equalIgnoringASCIICase(certificateStringView, "valid"))
+ return Succeeded;
+ return Failed;
}
+}
+
#endif
Modified: trunk/Source/WebCore/testing/MockCDMFactory.h (210548 => 210549)
--- 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)
@@ -57,6 +57,9 @@
bool canCreateInstances() const { return m_canCreateInstances; }
void setCanCreateInstances(bool flag) { m_canCreateInstances = flag; }
+ bool supportsServerCertificates() const { return m_supportsServerCertificates; }
+ void setSupportsServerCertificates(bool flag) { m_supportsServerCertificates = flag; }
+
void unregister();
private:
@@ -70,6 +73,7 @@
Vector<String> m_supportedRobustness;
bool m_registered { true };
bool m_canCreateInstances { true };
+ bool m_supportsServerCertificates { true };
WeakPtrFactory<MockCDMFactory> m_weakPtrFactory;
};
@@ -92,6 +96,7 @@
bool distinctiveIdentifiersAreUniquePerOriginAndClearable(const MediaKeySystemConfiguration&) final;
std::unique_ptr<CDMInstance> createInstance() final;
void loadAndInitialize() final;
+ bool supportsServerCertificates() const final;
WeakPtr<MockCDMFactory> m_factory;
WeakPtrFactory<MockCDM> m_weakPtrFactory;
@@ -105,6 +110,7 @@
SuccessValue initializeWithConfiguration(const MediaKeySystemConfiguration&) final;
SuccessValue setDistinctiveIdentifiersAllowed(bool) final;
SuccessValue setPersistentStateAllowed(bool) final;
+ SuccessValue setServerCertificate(JSC::ArrayBuffer&) final;
WeakPtr<MockCDM> m_cdm;
bool m_distinctiveIdentifiersAllowed { true };
Modified: trunk/Source/WebCore/testing/MockCDMFactory.idl (210548 => 210549)
--- 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)
@@ -33,6 +33,7 @@
attribute MediaKeysRequirement distinctiveIdentifiersRequirement;
attribute MediaKeysRequirement persistentStateRequirement;
attribute boolean canCreateInstances;
+ attribute boolean supportsServerCertificates;
void unregister();
};
