Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1706)

Unified Diff: Source/modules/encryptedmedia/MediaKeySession.h

Issue 1227783004: Fix virtual/override/final usage in Source/modules/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/encryptedmedia/MediaKeySession.h
diff --git a/Source/modules/encryptedmedia/MediaKeySession.h b/Source/modules/encryptedmedia/MediaKeySession.h
index 49b7f5d5d69aefefb2f8e86dac0fdd607f1cf27b..be4a635d2822f546ca3ee7095223bea9a4bf7ddd 100644
--- a/Source/modules/encryptedmedia/MediaKeySession.h
+++ b/Source/modules/encryptedmedia/MediaKeySession.h
@@ -67,7 +67,7 @@ class MediaKeySession final
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeySession);
public:
static MediaKeySession* create(ScriptState*, MediaKeys*, WebEncryptedMediaSessionType);
- virtual ~MediaKeySession();
+ ~MediaKeySession() override;
String sessionId() const;
double expiration() const { return m_expiration; }
@@ -82,12 +82,12 @@ public:
ScriptPromise remove(ScriptState*);
// EventTarget
- virtual const AtomicString& interfaceName() const override;
- virtual ExecutionContext* executionContext() const override;
+ const AtomicString& interfaceName() const override;
+ ExecutionContext* executionContext() const override;
// ActiveDOMObject
- virtual bool hasPendingActivity() const override;
- virtual void stop() override;
+ bool hasPendingActivity() const override;
+ void stop() override;
// Oilpan: eagerly release owned m_session, which in turn
// drops the client reference back to this MediaKeySession object.
@@ -104,10 +104,10 @@ private:
void actionTimerFired(Timer<MediaKeySession>*);
// WebContentDecryptionModuleSession::Client
- virtual void message(MessageType, const unsigned char* message, size_t messageLength) override;
- virtual void close() override;
- virtual void expirationChanged(double updatedExpiryTimeInMS) override;
- virtual void keysStatusesChange(const WebVector<WebEncryptedMediaKeyInformation>&, bool hasAdditionalUsableKey) override;
+ void message(MessageType, const unsigned char* message, size_t messageLength) override;
+ void close() override;
+ void expirationChanged(double updatedExpiryTimeInMS) override;
+ void keysStatusesChange(const WebVector<WebEncryptedMediaKeyInformation>&, bool hasAdditionalUsableKey) override;
// Called by NewSessionResult when the new session has been created.
void finishGenerateRequest();
« no previous file with comments | « Source/modules/encryptedmedia/MediaKeyMessageEvent.h ('k') | Source/modules/encryptedmedia/MediaKeySession.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698