Index: Source/core/html/HTMLMediaElement.h |
diff --git a/Source/core/html/HTMLMediaElement.h b/Source/core/html/HTMLMediaElement.h |
index a7afaacc94b718ffb6a169d0f91b06d207dbefc6..af15b351d9f84edca6bc951e275175658e767221 100644 |
--- a/Source/core/html/HTMLMediaElement.h |
+++ b/Source/core/html/HTMLMediaElement.h |
@@ -82,7 +82,7 @@ public: |
static void setMediaStreamRegistry(URLRegistry*); |
static bool isMediaStreamURL(const String& url); |
- virtual void trace(Visitor*) OVERRIDE; |
+ virtual void trace(Visitor*) override; |
#if ENABLE(WEB_AUDIO) |
void clearWeakMembers(Visitor*); |
#endif |
@@ -199,10 +199,10 @@ public: |
blink::WebMediaPlayer::TrackId addVideoTrack(const String& id, blink::WebMediaPlayerClient::VideoTrackKind, const AtomicString& label, const AtomicString& language, bool selected); |
void removeVideoTrack(blink::WebMediaPlayer::TrackId); |
- virtual void mediaPlayerDidAddTextTrack(blink::WebInbandTextTrack*) OVERRIDE FINAL; |
- virtual void mediaPlayerDidRemoveTextTrack(blink::WebInbandTextTrack*) OVERRIDE FINAL; |
+ virtual void mediaPlayerDidAddTextTrack(blink::WebInbandTextTrack*) override final; |
+ virtual void mediaPlayerDidRemoveTextTrack(blink::WebInbandTextTrack*) override final; |
// FIXME: Remove this when WebMediaPlayerClientImpl::loadInternal does not depend on it. |
- virtual KURL mediaPlayerPosterURL() OVERRIDE { return KURL(); } |
+ virtual KURL mediaPlayerPosterURL() override { return KURL(); } |
class TrackGroup { |
STACK_ALLOCATED(); |
@@ -271,8 +271,8 @@ public: |
void sourceWasAdded(HTMLSourceElement*); |
// ActiveDOMObject functions. |
- virtual bool hasPendingActivity() const OVERRIDE FINAL; |
- virtual void contextDestroyed() OVERRIDE FINAL; |
+ virtual bool hasPendingActivity() const override final; |
+ virtual void contextDestroyed() override final; |
#if ENABLE(WEB_AUDIO) |
AudioSourceProviderClient* audioSourceNode() { return m_audioSourceNode; } |
@@ -313,12 +313,12 @@ protected: |
HTMLMediaElement(const QualifiedName&, Document&); |
virtual ~HTMLMediaElement(); |
- virtual void parseAttribute(const QualifiedName&, const AtomicString&) OVERRIDE; |
- virtual void finishParsingChildren() OVERRIDE FINAL; |
- virtual bool isURLAttribute(const Attribute&) const OVERRIDE; |
- virtual void attach(const AttachContext& = AttachContext()) OVERRIDE; |
+ virtual void parseAttribute(const QualifiedName&, const AtomicString&) override; |
+ virtual void finishParsingChildren() override final; |
+ virtual bool isURLAttribute(const Attribute&) const override; |
+ virtual void attach(const AttachContext& = AttachContext()) override; |
- virtual void didMoveToNewDocument(Document& oldDocument) OVERRIDE; |
+ virtual void didMoveToNewDocument(Document& oldDocument) override; |
enum DisplayMode { Unknown, Poster, PosterWaitingForVideo, Video }; |
DisplayMode displayMode() const { return m_displayMode; } |
@@ -333,42 +333,42 @@ protected: |
private: |
void createMediaPlayer(); |
- virtual bool alwaysCreateUserAgentShadowRoot() const OVERRIDE FINAL { return true; } |
- virtual bool areAuthorShadowsAllowed() const OVERRIDE FINAL { return false; } |
+ virtual bool alwaysCreateUserAgentShadowRoot() const override final { return true; } |
+ virtual bool areAuthorShadowsAllowed() const override final { return false; } |
- virtual bool supportsFocus() const OVERRIDE FINAL; |
- virtual bool isMouseFocusable() const OVERRIDE FINAL; |
- virtual bool rendererIsNeeded(const RenderStyle&) OVERRIDE; |
- virtual RenderObject* createRenderer(RenderStyle*) OVERRIDE; |
- virtual InsertionNotificationRequest insertedInto(ContainerNode*) OVERRIDE FINAL; |
- virtual void didNotifySubtreeInsertionsToDocument() OVERRIDE; |
- virtual void removedFrom(ContainerNode*) OVERRIDE FINAL; |
- virtual void didRecalcStyle(StyleRecalcChange) OVERRIDE FINAL; |
+ virtual bool supportsFocus() const override final; |
+ virtual bool isMouseFocusable() const override final; |
+ virtual bool rendererIsNeeded(const RenderStyle&) override; |
+ virtual RenderObject* createRenderer(RenderStyle*) override; |
+ virtual InsertionNotificationRequest insertedInto(ContainerNode*) override final; |
+ virtual void didNotifySubtreeInsertionsToDocument() override; |
+ virtual void removedFrom(ContainerNode*) override final; |
+ virtual void didRecalcStyle(StyleRecalcChange) override final; |
- virtual void didBecomeFullscreenElement() OVERRIDE FINAL; |
- virtual void willStopBeingFullscreenElement() OVERRIDE FINAL; |
- virtual bool isInteractiveContent() const OVERRIDE FINAL; |
- virtual void defaultEventHandler(Event*) OVERRIDE FINAL; |
+ virtual void didBecomeFullscreenElement() override final; |
+ virtual void willStopBeingFullscreenElement() override final; |
+ virtual bool isInteractiveContent() const override final; |
+ virtual void defaultEventHandler(Event*) override final; |
// ActiveDOMObject functions. |
- virtual void stop() OVERRIDE FINAL; |
+ virtual void stop() override final; |
virtual void updateDisplayState() { } |
void setReadyState(ReadyState); |
void setNetworkState(blink::WebMediaPlayer::NetworkState); |
- virtual void mediaPlayerNetworkStateChanged() OVERRIDE FINAL; |
- virtual void mediaPlayerReadyStateChanged() OVERRIDE FINAL; |
- virtual void mediaPlayerTimeChanged() OVERRIDE FINAL; |
- virtual void mediaPlayerDurationChanged() OVERRIDE FINAL; |
- virtual void mediaPlayerPlaybackStateChanged() OVERRIDE FINAL; |
- virtual void mediaPlayerRequestFullscreen() OVERRIDE FINAL; |
- virtual void mediaPlayerRequestSeek(double) OVERRIDE FINAL; |
- virtual void mediaPlayerRepaint() OVERRIDE FINAL; |
- virtual void mediaPlayerSizeChanged() OVERRIDE FINAL; |
- virtual void mediaPlayerSetWebLayer(blink::WebLayer*) OVERRIDE FINAL; |
- virtual void mediaPlayerMediaSourceOpened(blink::WebMediaSource*) OVERRIDE FINAL; |
+ virtual void mediaPlayerNetworkStateChanged() override final; |
+ virtual void mediaPlayerReadyStateChanged() override final; |
+ virtual void mediaPlayerTimeChanged() override final; |
+ virtual void mediaPlayerDurationChanged() override final; |
+ virtual void mediaPlayerPlaybackStateChanged() override final; |
+ virtual void mediaPlayerRequestFullscreen() override final; |
+ virtual void mediaPlayerRequestSeek(double) override final; |
+ virtual void mediaPlayerRepaint() override final; |
+ virtual void mediaPlayerSizeChanged() override final; |
+ virtual void mediaPlayerSetWebLayer(blink::WebLayer*) override final; |
+ virtual void mediaPlayerMediaSourceOpened(blink::WebMediaSource*) override final; |
void loadTimerFired(Timer<HTMLMediaElement>*); |
void progressEventTimerFired(Timer<HTMLMediaElement>*); |
@@ -442,7 +442,7 @@ private: |
bool createMediaControls(); |
void configureMediaControls(); |
- virtual void* preDispatchEventHandler(Event*) OVERRIDE FINAL; |
+ virtual void* preDispatchEventHandler(Event*) override final; |
void changeNetworkStateFromLoadingToIdle(); |