| Index: Source/core/rendering/RenderMedia.h
|
| diff --git a/Source/core/rendering/RenderMedia.h b/Source/core/rendering/RenderMedia.h
|
| index a5cda7b6274bcb36ce0e35af7fb720f5adc8cc97..85f0c06b4a7365504ea06d432bf7fcfdc3f71cb7 100644
|
| --- a/Source/core/rendering/RenderMedia.h
|
| +++ b/Source/core/rendering/RenderMedia.h
|
| @@ -36,7 +36,7 @@ class RenderMedia : public RenderImage {
|
| public:
|
| explicit RenderMedia(HTMLMediaElement*);
|
| virtual ~RenderMedia();
|
| - virtual void trace(Visitor*) OVERRIDE;
|
| + virtual void trace(Visitor*) override;
|
|
|
| RenderObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
|
| RenderObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
|
| @@ -51,23 +51,23 @@ public:
|
| HTMLMediaElement* mediaElement() const;
|
|
|
| protected:
|
| - virtual void layout() OVERRIDE;
|
| + virtual void layout() override;
|
|
|
| private:
|
| - virtual RenderObjectChildList* virtualChildren() OVERRIDE FINAL { return children(); }
|
| - virtual const RenderObjectChildList* virtualChildren() const OVERRIDE FINAL { return children(); }
|
| + virtual RenderObjectChildList* virtualChildren() override final { return children(); }
|
| + virtual const RenderObjectChildList* virtualChildren() const override final { return children(); }
|
|
|
| - virtual LayerType layerTypeRequired() const OVERRIDE { return NormalLayer; }
|
| + virtual LayerType layerTypeRequired() const override { return NormalLayer; }
|
|
|
| // FIXME: RenderMedia::layout makes assumptions about what children are allowed
|
| // so we can't support generated content.
|
| - virtual bool canHaveGeneratedChildren() const OVERRIDE FINAL { return false; }
|
| - virtual bool canHaveChildren() const OVERRIDE FINAL { return true; }
|
| + virtual bool canHaveGeneratedChildren() const override final { return false; }
|
| + virtual bool canHaveChildren() const override final { return true; }
|
|
|
| - virtual const char* renderName() const OVERRIDE { return "RenderMedia"; }
|
| - virtual bool isMedia() const OVERRIDE FINAL { return true; }
|
| - virtual bool isImage() const OVERRIDE FINAL { return false; }
|
| - virtual void paintReplaced(PaintInfo&, const LayoutPoint&) OVERRIDE;
|
| + virtual const char* renderName() const override { return "RenderMedia"; }
|
| + virtual bool isMedia() const override final { return true; }
|
| + virtual bool isImage() const override final { return false; }
|
| + virtual void paintReplaced(PaintInfo&, const LayoutPoint&) override;
|
|
|
| RenderObjectChildList m_children;
|
| };
|
|
|