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

Side by Side Diff: Source/core/rendering/RenderRubyBase.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 unified diff | Download patch
« no previous file with comments | « Source/core/rendering/RenderRuby.h ('k') | Source/core/rendering/RenderRubyRun.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 19 matching lines...) Expand all
30 30
31 #ifndef RenderRubyBase_h 31 #ifndef RenderRubyBase_h
32 #define RenderRubyBase_h 32 #define RenderRubyBase_h
33 33
34 #include "core/rendering/RenderBlockFlow.h" 34 #include "core/rendering/RenderBlockFlow.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 class RenderRubyRun; 38 class RenderRubyRun;
39 39
40 class RenderRubyBase FINAL : public RenderBlockFlow { 40 class RenderRubyBase final : public RenderBlockFlow {
41 public: 41 public:
42 virtual ~RenderRubyBase(); 42 virtual ~RenderRubyBase();
43 43
44 static RenderRubyBase* createAnonymous(Document*); 44 static RenderRubyBase* createAnonymous(Document*);
45 45
46 virtual const char* renderName() const OVERRIDE { return "RenderRubyBase (an onymous)"; } 46 virtual const char* renderName() const override { return "RenderRubyBase (an onymous)"; }
47 47
48 virtual bool isRubyBase() const OVERRIDE { return true; } 48 virtual bool isRubyBase() const override { return true; }
49 49
50 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE; 50 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override;
51 51
52 private: 52 private:
53 RenderRubyBase(); 53 RenderRubyBase();
54 54
55 virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const OVERRI DE; 55 virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const overri de;
56 virtual void adjustInlineDirectionLineBounds(unsigned expansionOpportunityCo unt, float& logicalLeft, float& logicalWidth) const OVERRIDE; 56 virtual void adjustInlineDirectionLineBounds(unsigned expansionOpportunityCo unt, float& logicalLeft, float& logicalWidth) const override;
57 57
58 void moveChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0); 58 void moveChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);
59 void moveInlineChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0); 59 void moveInlineChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0);
60 void moveBlockChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0 ); 60 void moveBlockChildren(RenderRubyBase* toBase, RenderObject* beforeChild = 0 );
61 61
62 // Allow RenderRubyRun to manipulate the children within ruby bases. 62 // Allow RenderRubyRun to manipulate the children within ruby bases.
63 friend class RenderRubyRun; 63 friend class RenderRubyRun;
64 }; 64 };
65 65
66 } // namespace blink 66 } // namespace blink
67 67
68 #endif // RenderRubyBase_h 68 #endif // RenderRubyBase_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderRuby.h ('k') | Source/core/rendering/RenderRubyRun.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698