Chromium Code Reviews| Index: Source/core/html/shadow/MediaControlElementTypes.h |
| diff --git a/Source/core/html/shadow/MediaControlElementTypes.h b/Source/core/html/shadow/MediaControlElementTypes.h |
| index 19c3ca569e8884f26b15698f6c712ddeb690bbf7..dc710c18b3a0d5efa87ad29898b35bb0a3e08966 100644 |
| --- a/Source/core/html/shadow/MediaControlElementTypes.h |
| +++ b/Source/core/html/shadow/MediaControlElementTypes.h |
| @@ -87,14 +87,13 @@ public: |
| virtual const AtomicString& shadowPseudoId() const = 0; |
| virtual void setMediaController(MediaControllerInterface* controller) { m_mediaController = controller; } |
| - virtual MediaControllerInterface* mediaController() const { return m_mediaController; } |
| + MediaControllerInterface* mediaController() const { return m_mediaController; } |
| protected: |
| explicit MediaControlElement(MediaControlElementType, HTMLElement*); |
| ~MediaControlElement() { } |
| virtual void setDisplayType(MediaControlElementType); |
| - virtual bool isMediaControlElement() const { return true; } |
| private: |
| MediaControllerInterface* m_mediaController; |
| @@ -106,7 +105,7 @@ private: |
| class MediaControlDivElement : public HTMLDivElement, public MediaControlElement { |
| protected: |
| - virtual bool isMediaControlElement() const OVERRIDE { return MediaControlElement::isMediaControlElement(); } |
| + virtual bool isMediaControlElement() const OVERRIDE { return true; } |
|
Inactive
2014/01/10 19:03:09
Should be FINAL
|
| explicit MediaControlDivElement(Document&, MediaControlElementType); |
| }; |
| @@ -114,7 +113,7 @@ protected: |
| class MediaControlInputElement : public HTMLInputElement, public MediaControlElement { |
| protected: |
| - virtual bool isMediaControlElement() const OVERRIDE { return MediaControlElement::isMediaControlElement(); } |
| + virtual bool isMediaControlElement() const OVERRIDE { return true; } |
|
Inactive
2014/01/10 19:03:09
Ditto.
|
| explicit MediaControlInputElement(Document&, MediaControlElementType); |
| private: |