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

Unified Diff: Source/core/layout/LayoutRubyRun.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/LayoutRubyBase.h ('k') | Source/core/layout/LayoutRubyText.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutRubyRun.h
diff --git a/Source/core/layout/LayoutRubyRun.h b/Source/core/layout/LayoutRubyRun.h
index ad4a7b4a9e23e61ab62575eb73228780ab96b6e0..7d4b6b576450619415239fa841a0691c0f64a2ff 100644
--- a/Source/core/layout/LayoutRubyRun.h
+++ b/Source/core/layout/LayoutRubyRun.h
@@ -43,7 +43,7 @@ class LayoutRubyText;
class LayoutRubyRun final : public LayoutBlockFlow {
public:
- virtual ~LayoutRubyRun();
+ ~LayoutRubyRun() override;
bool hasRubyText() const;
bool hasRubyBase() const;
@@ -51,18 +51,18 @@ public:
LayoutRubyBase* rubyBase() const;
LayoutRubyBase* rubyBaseSafe(); // creates the base if it doesn't already exist
- virtual LayoutObject* layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope&) override;
- virtual void layout() override;
+ LayoutObject* layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope&) override;
+ void layout() override;
- virtual bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
- virtual void addChild(LayoutObject* child, LayoutObject* beforeChild = nullptr) override;
- virtual void removeChild(LayoutObject* child) override;
+ bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
+ void addChild(LayoutObject* child, LayoutObject* beforeChild = nullptr) override;
+ void removeChild(LayoutObject* child) override;
void getOverhang(bool firstLine, LayoutObject* startLayoutObject, LayoutObject* endLayoutObject, int& startOverhang, int& endOverhang) const;
static LayoutRubyRun* staticCreateRubyRun(const LayoutObject* parentRuby);
- virtual const char* name() const override { return "LayoutRubyRun"; }
+ const char* name() const override { return "LayoutRubyRun"; }
protected:
LayoutRubyBase* createRubyBase() const;
@@ -70,9 +70,9 @@ protected:
private:
LayoutRubyRun();
- virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRubyRun || LayoutBlockFlow::isOfType(type); }
- virtual bool createsAnonymousWrapper() const override { return true; }
- virtual void removeLeftoverAnonymousBlock(LayoutBlock*) override { }
+ bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRubyRun || LayoutBlockFlow::isOfType(type); }
+ bool createsAnonymousWrapper() const override { return true; }
+ void removeLeftoverAnonymousBlock(LayoutBlock*) override { }
};
DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutRubyRun, isRubyRun());
« no previous file with comments | « Source/core/layout/LayoutRubyBase.h ('k') | Source/core/layout/LayoutRubyText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698