icecat: update to upstream version 128.0.14-1gnu1
This commit is contained in:
parent
0cdda4f34e
commit
56c3deff60
77 changed files with 8997 additions and 3862 deletions
|
|
@ -46,11 +46,11 @@ CDM_API
|
|||
void* CreateCdmInstance(int cdm_interface_version, const char* key_system,
|
||||
uint32_t key_system_size,
|
||||
GetCdmHostFunc get_cdm_host_func, void* user_data) {
|
||||
if (cdm_interface_version != cdm::ContentDecryptionModule_10::kVersion) {
|
||||
// Only support CDM version 10 currently.
|
||||
if (cdm_interface_version != cdm::ContentDecryptionModule_11::kVersion) {
|
||||
// Only support CDM version 11 currently.
|
||||
return nullptr;
|
||||
}
|
||||
cdm::Host_10* host = static_cast<cdm::Host_10*>(
|
||||
cdm::Host_11* host = static_cast<cdm::Host_11*>(
|
||||
get_cdm_host_func(cdm_interface_version, user_data));
|
||||
return new FakeDecryptor(host);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ class TestManager {
|
|||
std::set<std::string> mTestIDs;
|
||||
};
|
||||
|
||||
FakeDecryptor::FakeDecryptor(cdm::Host_10* aHost) : mHost(aHost) {
|
||||
FakeDecryptor::FakeDecryptor(cdm::Host_11* aHost) : mHost(aHost) {
|
||||
MOZ_ASSERT(!sInstance);
|
||||
sInstance = this;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
class FakeDecryptor : public cdm::ContentDecryptionModule_10 {
|
||||
public:
|
||||
explicit FakeDecryptor(cdm::Host_10* aHost);
|
||||
explicit FakeDecryptor(cdm::Host_11* aHost);
|
||||
|
||||
void Initialize(bool aAllowDistinctiveIdentifier, bool aAllowPersistentState,
|
||||
bool aUseHardwareSecureCodecs) override {
|
||||
|
|
@ -93,7 +93,7 @@ class FakeDecryptor : public cdm::ContentDecryptionModule_10 {
|
|||
|
||||
static void Message(const std::string& aMessage);
|
||||
|
||||
cdm::Host_10* mHost;
|
||||
cdm::Host_11* mHost;
|
||||
|
||||
static FakeDecryptor* sInstance;
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ class WriteRecordClient : public FileIOClient {
|
|||
|
||||
void OnWriteComplete(Status aStatus) override { Done(aStatus); }
|
||||
|
||||
void Do(const std::string& aName, Host_10* aHost) {
|
||||
void Do(const std::string& aName, Host_11* aHost) {
|
||||
// Initialize the FileIO.
|
||||
mFileIO = aHost->CreateFileIO(this);
|
||||
mFileIO->Open(aName.c_str(), aName.size());
|
||||
|
|
@ -64,7 +64,7 @@ class WriteRecordClient : public FileIOClient {
|
|||
std::vector<uint8_t> mData;
|
||||
};
|
||||
|
||||
void WriteRecord(Host_10* aHost, const std::string& aRecordName,
|
||||
void WriteRecord(Host_11* aHost, const std::string& aRecordName,
|
||||
const uint8_t* aData, uint32_t aNumBytes,
|
||||
std::function<void()>&& aOnSuccess,
|
||||
std::function<void()>&& aOnFailure) {
|
||||
|
|
@ -74,7 +74,7 @@ void WriteRecord(Host_10* aHost, const std::string& aRecordName,
|
|||
client->Do(aRecordName, aHost);
|
||||
}
|
||||
|
||||
void WriteRecord(Host_10* aHost, const std::string& aRecordName,
|
||||
void WriteRecord(Host_11* aHost, const std::string& aRecordName,
|
||||
const std::string& aData, std::function<void()>&& aOnSuccess,
|
||||
std::function<void()>&& aOnFailure) {
|
||||
return WriteRecord(aHost, aRecordName, (const uint8_t*)aData.c_str(),
|
||||
|
|
@ -104,7 +104,7 @@ class ReadRecordClient : public FileIOClient {
|
|||
|
||||
void OnWriteComplete(Status aStatus) override {}
|
||||
|
||||
void Do(const std::string& aName, Host_10* aHost) {
|
||||
void Do(const std::string& aName, Host_11* aHost) {
|
||||
mFileIO = aHost->CreateFileIO(this);
|
||||
mFileIO->Open(aName.c_str(), aName.size());
|
||||
}
|
||||
|
|
@ -136,7 +136,7 @@ class ReadRecordClient : public FileIOClient {
|
|||
};
|
||||
|
||||
void ReadRecord(
|
||||
Host_10* aHost, const std::string& aRecordName,
|
||||
Host_11* aHost, const std::string& aRecordName,
|
||||
std::function<void(bool, const uint8_t*, uint32_t)>&& aOnReadComplete) {
|
||||
// client will be delete in ReadRecordClient::Done
|
||||
ReadRecordClient* client = new ReadRecordClient(std::move(aOnReadComplete));
|
||||
|
|
@ -155,7 +155,7 @@ class OpenRecordClient : public FileIOClient {
|
|||
|
||||
void OnWriteComplete(Status aStatus) override {}
|
||||
|
||||
void Do(const std::string& aName, Host_10* aHost) {
|
||||
void Do(const std::string& aName, Host_11* aHost) {
|
||||
// Initialize the FileIO.
|
||||
mFileIO = aHost->CreateFileIO(this);
|
||||
mFileIO->Open(aName.c_str(), aName.size());
|
||||
|
|
@ -186,7 +186,7 @@ class OpenRecordClient : public FileIOClient {
|
|||
std::function<void(bool)> mOpenComplete;
|
||||
};
|
||||
|
||||
void OpenRecord(Host_10* aHost, const std::string& aRecordName,
|
||||
void OpenRecord(Host_11* aHost, const std::string& aRecordName,
|
||||
std::function<void(bool)>&& aOpenComplete) {
|
||||
// client will be delete in OpenRecordClient::Done
|
||||
OpenRecordClient* client = new OpenRecordClient(std::move(aOpenComplete));
|
||||
|
|
|
|||
|
|
@ -21,17 +21,17 @@ class ReadContinuation {
|
|||
uint32_t aDataSize) = 0;
|
||||
};
|
||||
|
||||
void WriteRecord(cdm::Host_10* aHost, const std::string& aRecordName,
|
||||
void WriteRecord(cdm::Host_11* aHost, const std::string& aRecordName,
|
||||
const std::string& aData, std::function<void()>&& aOnSuccess,
|
||||
std::function<void()>&& aOnFailure);
|
||||
|
||||
void WriteRecord(cdm::Host_10* aHost, const std::string& aRecordName,
|
||||
void WriteRecord(cdm::Host_11* aHost, const std::string& aRecordName,
|
||||
const uint8_t* aData, uint32_t aNumBytes,
|
||||
std::function<void()>&& aOnSuccess,
|
||||
std::function<void()>&& aOnFailure);
|
||||
|
||||
void ReadRecord(
|
||||
cdm::Host_10* aHost, const std::string& aRecordName,
|
||||
cdm::Host_11* aHost, const std::string& aRecordName,
|
||||
std::function<void(bool, const uint8_t*, uint32_t)>&& aOnReadComplete);
|
||||
|
||||
class OpenContinuation {
|
||||
|
|
@ -40,6 +40,6 @@ class OpenContinuation {
|
|||
virtual void operator()(bool aSuccess) = 0;
|
||||
};
|
||||
|
||||
void OpenRecord(cdm::Host_10* aHost, const std::string& aRecordName,
|
||||
void OpenRecord(cdm::Host_11* aHost, const std::string& aRecordName,
|
||||
std::function<void(bool)>&& aOpenComplete);
|
||||
#endif // TEST_CDM_STORAGE_H__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue