Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1919768 - Remove global constructor from dom/media/fake-cdm/cdm-test-decryptor.cpp r=emilio

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D222793
This commit is contained in:
serge-sans-paille 2024-09-20 05:54:02 +00:00
parent 875628fc84
commit 5af01039ef
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/media/fake-cdm/cdm-test-decryptor.cpp
View File

@ -86,8 +86,8 @@ std::vector<std::string> Tokenize(const std::string& aString) {
return std::vector<std::string>(it, end);
}
static const std::string TruncateRecordId = "truncate-record-id";
static const std::string TruncateRecordData = "I will soon be truncated";
static const char TruncateRecordId[] = "truncate-record-id";
static const char TruncateRecordData[] = "I will soon be truncated";
template <class Continuation>
class WriteRecordSuccessTask {
@ -225,7 +225,7 @@ class VerifyAndOverwriteContinuation : public ReadContinuation {
const std::string mTestID;
};
static const std::string OpenAgainRecordId = "open-again-record-id";
static const char OpenAgainRecordId[] = "open-again-record-id";
class OpenedSecondTimeContinuation : public OpenContinuation {
public:
@ -390,7 +390,6 @@ class ReportReadRecordContinuation : public ReadContinuation {
enum ShutdownMode { ShutdownNormal, ShutdownTimeout, ShutdownStoreToken };
static ShutdownMode sShutdownMode = ShutdownNormal;
static std::string sShutdownToken;
void FakeDecryptor::UpdateSession(uint32_t aPromiseId, const char* aSessionId,
uint32_t aSessionIdLength,
@ -421,8 +420,7 @@ void FakeDecryptor::UpdateSession(uint32_t aPromiseId, const char* aSessionId,
sShutdownMode = ShutdownTimeout;
} else if (mode == "token") {
sShutdownMode = ShutdownStoreToken;
sShutdownToken = tokens[2];
Message("shutdown-token received " + sShutdownToken);
Message("shutdown-token received " + tokens[2]);
}
} else if (task == "retrieve-shutdown-token") {
ReadRecord(FakeDecryptor::sInstance->mHost, "shutdown-token",