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

Unified Diff: Source/core/layout/LayoutFrameSet.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/LayoutFrame.h ('k') | Source/core/layout/LayoutFullScreen.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutFrameSet.h
diff --git a/Source/core/layout/LayoutFrameSet.h b/Source/core/layout/LayoutFrameSet.h
index 526628eeb60c7640986bc3cd1d43d2a7ccb4ccea..7a9aaa89778f64ee3ca61ba26396431d97816e95 100644
--- a/Source/core/layout/LayoutFrameSet.h
+++ b/Source/core/layout/LayoutFrameSet.h
@@ -56,7 +56,7 @@ private:
class LayoutFrameSet final : public LayoutBox {
public:
LayoutFrameSet(HTMLFrameSetElement*);
- virtual ~LayoutFrameSet();
+ ~LayoutFrameSet() override;
LayoutObject* firstChild() const { ASSERT(children() == virtualChildren()); return children()->firstChild(); }
LayoutObject* lastChild() const { ASSERT(children() == virtualChildren()); return children()->lastChild(); }
@@ -95,21 +95,21 @@ public:
const GridAxis& rows() { return m_rows; }
const GridAxis& columns() { return m_cols; }
- virtual const char* name() const override { return "LayoutFrameSet"; }
+ const char* name() const override { return "LayoutFrameSet"; }
private:
static const int noSplit = -1;
- virtual LayoutObjectChildList* virtualChildren() override { return children(); }
- virtual const LayoutObjectChildList* virtualChildren() const override { return children(); }
+ LayoutObjectChildList* virtualChildren() override { return children(); }
+ const LayoutObjectChildList* virtualChildren() const override { return children(); }
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectFrameSet || LayoutBox::isOfType(type); }
+ bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectFrameSet || LayoutBox::isOfType(type); }
- virtual void layout() override;
- virtual void paint(const PaintInfo&, const LayoutPoint&) override;
- virtual void computePreferredLogicalWidths() override;
- virtual bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
- virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const override;
+ void layout() override;
+ void paint(const PaintInfo&, const LayoutPoint&) override;
+ void computePreferredLogicalWidths() override;
+ bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
+ CursorDirective getCursor(const LayoutPoint&, Cursor&) const override;
void setIsResizing(bool);
« no previous file with comments | « Source/core/layout/LayoutFrame.h ('k') | Source/core/layout/LayoutFullScreen.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698