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

Unified Diff: Source/core/layout/LayoutMedia.h

Issue 1231363003: Fix virtual/override/final usage in Source/core/layout/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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
« no previous file with comments | « Source/core/layout/LayoutListMarker.h ('k') | Source/core/layout/LayoutMenuList.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutMedia.h
diff --git a/Source/core/layout/LayoutMedia.h b/Source/core/layout/LayoutMedia.h
index f4fe6e5f5b661cc8816eadb5985e8661f36f0b14..0b77b5dac25fc30e0c86971b83deff5d72310564 100644
--- a/Source/core/layout/LayoutMedia.h
+++ b/Source/core/layout/LayoutMedia.h
@@ -35,7 +35,7 @@ class HTMLMediaElement;
class LayoutMedia : public LayoutImage {
public:
explicit LayoutMedia(HTMLMediaElement*);
- virtual ~LayoutMedia();
+ ~LayoutMedia() override;
LayoutObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
LayoutObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
@@ -49,26 +49,26 @@ public:
HTMLMediaElement* mediaElement() const;
- virtual const char* name() const override { return "LayoutMedia"; }
+ const char* name() const override { return "LayoutMedia"; }
protected:
- virtual void layout() override;
+ void layout() override;
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectMedia || LayoutImage::isOfType(type); }
+ bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectMedia || LayoutImage::isOfType(type); }
private:
- virtual LayoutObjectChildList* virtualChildren() override final { return children(); }
- virtual const LayoutObjectChildList* virtualChildren() const override final { return children(); }
+ LayoutObjectChildList* virtualChildren() final { return children(); }
+ const LayoutObjectChildList* virtualChildren() const final { return children(); }
- virtual DeprecatedPaintLayerType layerTypeRequired() const override { return NormalDeprecatedPaintLayer; }
+ DeprecatedPaintLayerType layerTypeRequired() const override { return NormalDeprecatedPaintLayer; }
- virtual bool canHaveChildren() const override final { return true; }
- virtual bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override final;
+ bool canHaveChildren() const final { return true; }
+ bool isChildAllowed(LayoutObject*, const ComputedStyle&) const final;
- virtual bool isImage() const override final { return false; }
- virtual void paintReplaced(const PaintInfo&, const LayoutPoint&) override;
+ bool isImage() const final { return false; }
+ void paintReplaced(const PaintInfo&, const LayoutPoint&) override;
- virtual bool backgroundShouldAlwaysBeClipped() const override final { return false; }
+ bool backgroundShouldAlwaysBeClipped() const final { return false; }
LayoutObjectChildList m_children;
};
« no previous file with comments | « Source/core/layout/LayoutListMarker.h ('k') | Source/core/layout/LayoutMenuList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698