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

Unified Diff: Source/core/rendering/RenderRubyRun.h

Issue 640593002: Replace FINAL and OVERRIDE with their C++11 counterparts in Source/core/[css|rendering|clipboard] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased the patch Created 6 years, 2 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/rendering/RenderRubyBase.h ('k') | Source/core/rendering/RenderRubyText.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderRubyRun.h
diff --git a/Source/core/rendering/RenderRubyRun.h b/Source/core/rendering/RenderRubyRun.h
index 1e6f87210c0a2da2b10a3199667eab9b825daba7..8c5e98a8a7336217abf2858d8f5b1af404daca92 100644
--- a/Source/core/rendering/RenderRubyRun.h
+++ b/Source/core/rendering/RenderRubyRun.h
@@ -41,7 +41,7 @@ class RenderRubyText;
// RenderRubyRun are 'inline-block/table' like objects,and wrap a single pairing of a ruby base with its ruby text(s).
// See RenderRuby.h for further comments on the structure
-class RenderRubyRun FINAL : public RenderBlockFlow {
+class RenderRubyRun final : public RenderBlockFlow {
public:
virtual ~RenderRubyRun();
@@ -51,12 +51,12 @@ public:
RenderRubyBase* rubyBase() const;
RenderRubyBase* rubyBaseSafe(); // creates the base if it doesn't already exist
- virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope&) OVERRIDE;
- virtual void layout() OVERRIDE;
+ virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope&) override;
+ virtual void layout() override;
- virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE;
- virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OVERRIDE;
- virtual void removeChild(RenderObject* child) OVERRIDE;
+ virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override;
+ virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override;
+ virtual void removeChild(RenderObject* child) override;
void getOverhang(bool firstLine, RenderObject* startRenderer, RenderObject* endRenderer, int& startOverhang, int& endOverhang) const;
@@ -68,10 +68,10 @@ protected:
private:
RenderRubyRun();
- virtual bool isRubyRun() const OVERRIDE { return true; }
- virtual const char* renderName() const OVERRIDE { return "RenderRubyRun (anonymous)"; }
- virtual bool createsAnonymousWrapper() const OVERRIDE { return true; }
- virtual void removeLeftoverAnonymousBlock(RenderBlock*) OVERRIDE { }
+ virtual bool isRubyRun() const override { return true; }
+ virtual const char* renderName() const override { return "RenderRubyRun (anonymous)"; }
+ virtual bool createsAnonymousWrapper() const override { return true; }
+ virtual void removeLeftoverAnonymousBlock(RenderBlock*) override { }
};
DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderRubyRun, isRubyRun());
« no previous file with comments | « Source/core/rendering/RenderRubyBase.h ('k') | Source/core/rendering/RenderRubyText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698