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

Bug 1240411: P3. Clean up EME header declarations. r=cpearce

Browse Source
This commit is contained in:
Jean-Yves Avenard 2016-01-18 14:29:21 +11:00
parent 9b530d4a1e
commit b3cd27d6e4
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
dom/media/eme/CDMCallbackProxy.h
View File

@ -17,43 +17,43 @@ namespace mozilla {
// object on the main thread.
class CDMCallbackProxy : public GMPDecryptorProxyCallback {
public:
virtual void SetSessionId(uint32_t aCreateSessionToken,
const nsCString& aSessionId) override;
void SetSessionId(uint32_t aCreateSessionToken,
const nsCString& aSessionId) override;
virtual void ResolveLoadSessionPromise(uint32_t aPromiseId,
bool aSuccess) override;
void ResolveLoadSessionPromise(uint32_t aPromiseId,
bool aSuccess) override;
virtual void ResolvePromise(uint32_t aPromiseId) override;
void ResolvePromise(uint32_t aPromiseId) override;
virtual void RejectPromise(uint32_t aPromiseId,
nsresult aException,
const nsCString& aSessionId) override;
void RejectPromise(uint32_t aPromiseId,
nsresult aException,
const nsCString& aSessionId) override;
virtual void SessionMessage(const nsCString& aSessionId,
GMPSessionMessageType aMessageType,
const nsTArray<uint8_t>& aMessage) override;
void SessionMessage(const nsCString& aSessionId,
GMPSessionMessageType aMessageType,
const nsTArray<uint8_t>& aMessage) override;
virtual void ExpirationChange(const nsCString& aSessionId,
GMPTimestamp aExpiryTime) override;
void ExpirationChange(const nsCString& aSessionId,
GMPTimestamp aExpiryTime) override;
virtual void SessionClosed(const nsCString& aSessionId) override;
void SessionClosed(const nsCString& aSessionId) override;
virtual void SessionError(const nsCString& aSessionId,
nsresult aException,
uint32_t aSystemCode,
const nsCString& aMessage) override;
void SessionError(const nsCString& aSessionId,
nsresult aException,
uint32_t aSystemCode,
const nsCString& aMessage) override;
virtual void KeyStatusChanged(const nsCString& aSessionId,
const nsTArray<uint8_t>& aKeyId,
GMPMediaKeyStatus aStatus) override;
void KeyStatusChanged(const nsCString& aSessionId,
const nsTArray<uint8_t>& aKeyId,
GMPMediaKeyStatus aStatus) override;
virtual void SetCaps(uint64_t aCaps) override;
void SetCaps(uint64_t aCaps) override;
virtual void Decrypted(uint32_t aId,
GMPErr aResult,
const nsTArray<uint8_t>& aDecryptedData) override;
void Decrypted(uint32_t aId,
GMPErr aResult,
const nsTArray<uint8_t>& aDecryptedData) override;
virtual void Terminated() override;
void Terminated() override;
~CDMCallbackProxy() {}

2
dom/media/eme/MediaEncryptedEvent.h
View File

@ -36,7 +36,7 @@ protected:
public:
virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
static already_AddRefed<MediaEncryptedEvent>
Constructor(EventTarget* aOwner);

2
dom/media/eme/MediaKeyError.h
View File

@ -24,7 +24,7 @@ public:
MediaKeyError(EventTarget* aOwner, uint32_t aSystemCode);
~MediaKeyError();
virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
uint32_t SystemCode() const;

2
dom/media/eme/MediaKeyMessageEvent.h
View File

@ -37,7 +37,7 @@ protected:
public:
virtual MediaKeyMessageEvent* AsMediaKeyMessageEvent();
virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
static already_AddRefed<MediaKeyMessageEvent>
Constructor(EventTarget* aOwner,

2
dom/media/eme/MediaKeySession.h
View File

@ -47,7 +47,7 @@ public:
void SetSessionId(const nsAString& aSessionId);
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
// Mark this as resultNotAddRefed to return raw pointers
MediaKeyError* GetError() const;

2
dom/media/eme/MediaKeyStatusMap.h
View File

@ -42,7 +42,7 @@ protected:
public:
nsPIDOMWindow* GetParentObject() const;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
MediaKeyStatus Get(const ArrayBufferViewOrArrayBuffer& aKey) const;
bool Has(const ArrayBufferViewOrArrayBuffer& aKey) const;

2
dom/media/eme/MediaKeySystemAccess.h
View File

@ -40,7 +40,7 @@ protected:
public:
nsPIDOMWindow* GetParentObject() const;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
void GetKeySystem(nsString& aRetVal) const;

2
dom/media/eme/MediaKeys.h
View File

@ -52,7 +52,7 @@ public:
nsPIDOMWindow* GetParentObject() const;
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
nsresult Bind(HTMLMediaElement* aElement);
void Unbind();