| Index: Source/core/html/shadow/MediaControlElements.h
|
| diff --git a/Source/core/html/shadow/MediaControlElements.h b/Source/core/html/shadow/MediaControlElements.h
|
| index 5f72cd0edd2f38c690290c07e01546869d60e726..1d284d07cc41b13da0819351f3aa7353a4d1c51e 100644
|
| --- a/Source/core/html/shadow/MediaControlElements.h
|
| +++ b/Source/core/html/shadow/MediaControlElements.h
|
| @@ -48,8 +48,8 @@ public:
|
| private:
|
| explicit MediaControlPanelElement(MediaControls&);
|
|
|
| - virtual void defaultEventHandler(Event*) override;
|
| - virtual bool keepEventInNode(Event*) override;
|
| + void defaultEventHandler(Event*) override;
|
| + bool keepEventInNode(Event*) override;
|
|
|
| void startTimer();
|
| void stopTimer();
|
| @@ -80,7 +80,7 @@ public:
|
|
|
| private:
|
| explicit MediaControlOverlayEnclosureElement(MediaControls&);
|
| - virtual void* preDispatchEventHandler(Event*) override;
|
| + void* preDispatchEventHandler(Event*) override;
|
| };
|
|
|
| // ----------------------------
|
| @@ -89,13 +89,13 @@ class MediaControlMuteButtonElement final : public MediaControlInputElement {
|
| public:
|
| static PassRefPtrWillBeRawPtr<MediaControlMuteButtonElement> create(MediaControls&);
|
|
|
| - virtual bool willRespondToMouseClickEvents() override { return true; }
|
| - virtual void updateDisplayType() override;
|
| + bool willRespondToMouseClickEvents() override { return true; }
|
| + void updateDisplayType() override;
|
|
|
| private:
|
| explicit MediaControlMuteButtonElement(MediaControls&);
|
|
|
| - virtual void defaultEventHandler(Event*) override;
|
| + void defaultEventHandler(Event*) override;
|
| };
|
|
|
| // ----------------------------
|
| @@ -104,13 +104,13 @@ class MediaControlPlayButtonElement final : public MediaControlInputElement {
|
| public:
|
| static PassRefPtrWillBeRawPtr<MediaControlPlayButtonElement> create(MediaControls&);
|
|
|
| - virtual bool willRespondToMouseClickEvents() override { return true; }
|
| - virtual void updateDisplayType() override;
|
| + bool willRespondToMouseClickEvents() override { return true; }
|
| + void updateDisplayType() override;
|
|
|
| private:
|
| explicit MediaControlPlayButtonElement(MediaControls&);
|
|
|
| - virtual void defaultEventHandler(Event*) override;
|
| + void defaultEventHandler(Event*) override;
|
| };
|
|
|
| // ----------------------------
|
| @@ -119,13 +119,13 @@ class MediaControlOverlayPlayButtonElement final : public MediaControlInputEleme
|
| public:
|
| static PassRefPtrWillBeRawPtr<MediaControlOverlayPlayButtonElement> create(MediaControls&);
|
|
|
| - virtual void updateDisplayType() override;
|
| + void updateDisplayType() override;
|
|
|
| private:
|
| explicit MediaControlOverlayPlayButtonElement(MediaControls&);
|
|
|
| - virtual void defaultEventHandler(Event*) override;
|
| - virtual bool keepEventInNode(Event*) override;
|
| + void defaultEventHandler(Event*) override;
|
| + bool keepEventInNode(Event*) override;
|
| };
|
|
|
| // ----------------------------
|
| @@ -134,14 +134,14 @@ class MediaControlToggleClosedCaptionsButtonElement final : public MediaControlI
|
| public:
|
| static PassRefPtrWillBeRawPtr<MediaControlToggleClosedCaptionsButtonElement> create(MediaControls&);
|
|
|
| - virtual bool willRespondToMouseClickEvents() override { return true; }
|
| + bool willRespondToMouseClickEvents() override { return true; }
|
|
|
| - virtual void updateDisplayType() override;
|
| + void updateDisplayType() override;
|
|
|
| private:
|
| explicit MediaControlToggleClosedCaptionsButtonElement(MediaControls&);
|
|
|
| - virtual void defaultEventHandler(Event*) override;
|
| + void defaultEventHandler(Event*) override;
|
| };
|
|
|
| // ----------------------------
|
| @@ -150,7 +150,7 @@ class MediaControlTimelineElement final : public MediaControlInputElement {
|
| public:
|
| static PassRefPtrWillBeRawPtr<MediaControlTimelineElement> create(MediaControls&);
|
|
|
| - virtual bool willRespondToMouseClickEvents() override;
|
| + bool willRespondToMouseClickEvents() override;
|
|
|
| // FIXME: An "earliest possible position" will be needed once that concept
|
| // is supported by HTMLMediaElement, see https://crbug.com/137275
|
| @@ -160,8 +160,8 @@ public:
|
| private:
|
| explicit MediaControlTimelineElement(MediaControls&);
|
|
|
| - virtual void defaultEventHandler(Event*) override;
|
| - virtual bool keepEventInNode(Event*) override;
|
| + void defaultEventHandler(Event*) override;
|
| + bool keepEventInNode(Event*) override;
|
| };
|
|
|
| // ----------------------------
|
| @@ -170,14 +170,14 @@ class MediaControlFullscreenButtonElement final : public MediaControlInputElemen
|
| public:
|
| static PassRefPtrWillBeRawPtr<MediaControlFullscreenButtonElement> create(MediaControls&);
|
|
|
| - virtual bool willRespondToMouseClickEvents() override { return true; }
|
| + bool willRespondToMouseClickEvents() override { return true; }
|
|
|
| void setIsFullscreen(bool);
|
|
|
| private:
|
| explicit MediaControlFullscreenButtonElement(MediaControls&);
|
|
|
| - virtual void defaultEventHandler(Event*) override;
|
| + void defaultEventHandler(Event*) override;
|
| };
|
|
|
| // ----------------------------
|
| @@ -186,16 +186,16 @@ class MediaControlCastButtonElement final : public MediaControlInputElement {
|
| public:
|
| static PassRefPtrWillBeRawPtr<MediaControlCastButtonElement> create(MediaControls&, bool isOverlayButton);
|
|
|
| - virtual bool willRespondToMouseClickEvents() override { return true; }
|
| + bool willRespondToMouseClickEvents() override { return true; }
|
|
|
| void setIsPlayingRemotely(bool);
|
|
|
| private:
|
| explicit MediaControlCastButtonElement(MediaControls&, bool isOverlayButton);
|
|
|
| - virtual const AtomicString& shadowPseudoId() const override;
|
| - virtual void defaultEventHandler(Event*) override;
|
| - virtual bool keepEventInNode(Event*) override;
|
| + const AtomicString& shadowPseudoId() const override;
|
| + void defaultEventHandler(Event*) override;
|
| + bool keepEventInNode(Event*) override;
|
|
|
| bool m_isOverlayButton;
|
| };
|
| @@ -206,15 +206,15 @@ class MediaControlVolumeSliderElement final : public MediaControlInputElement {
|
| public:
|
| static PassRefPtrWillBeRawPtr<MediaControlVolumeSliderElement> create(MediaControls&);
|
|
|
| - virtual bool willRespondToMouseMoveEvents() override;
|
| - virtual bool willRespondToMouseClickEvents() override;
|
| + bool willRespondToMouseMoveEvents() override;
|
| + bool willRespondToMouseClickEvents() override;
|
| void setVolume(double);
|
|
|
| private:
|
| explicit MediaControlVolumeSliderElement(MediaControls&);
|
|
|
| - virtual void defaultEventHandler(Event*) override;
|
| - virtual bool keepEventInNode(Event*) override;
|
| + void defaultEventHandler(Event*) override;
|
| + bool keepEventInNode(Event*) override;
|
| };
|
|
|
| // ----------------------------
|
|
|