Bug 1415466 - Part2 - Fix compile error due to the interface change.
MozReview-Commit-ID: FOIrboj029C
--- a/dom/media/gmp/ChromiumCDMChild.h
+++ b/dom/media/gmp/ChromiumCDMChild.h
@@ -66,18 +66,17 @@ public:
uint32_t aServiceIdSize,
const char* aChallenge,
uint32_t aChallengeSize) override {}
void EnableOutputProtection(uint32_t aDesiredProtectionMask) override {}
void QueryOutputProtectionStatus() override {}
void OnDeferredInitializationDone(cdm::StreamType aStreamType,
cdm::Status aDecoderStatus) override {}
// cdm::Host_9 interface
- // TODO: sync with unpstream, the interface has changed.
- void RequestStorageId() override {}
+ void RequestStorageId(uint32_t aVersion) override {}
cdm::FileIO* CreateFileIO(cdm::FileIOClient* aClient) override;
// cdm::Host_8 implementation
void OnSessionMessage(const char* aSessionId,
uint32_t aSessionIdSize,
cdm::MessageType aMessageType,
const char* aMessage,
uint32_t aMessageSize,
--- a/dom/media/gmp/GMPContentChild.cpp
+++ b/dom/media/gmp/GMPContentChild.cpp
@@ -261,17 +261,18 @@ public:
void OnQueryOutputProtectionStatus(cdm::QueryResult aResult,
uint32_t aLinkMask,
uint32_t aOutputProtectionMask) override
{
mCDM->OnQueryOutputProtectionStatus(aResult, aLinkMask, aOutputProtectionMask);
}
- void OnStorageId(const uint8_t* aStorageId,
+ void OnStorageId(uint32_t aVersion,
+ const uint8_t* aStorageId,
uint32_t aStorageIdSize) override
{
//Only support on version 9 CDM.
}
void Destroy() override
{
mCDM->Destroy();