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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « Source/core/rendering/RenderRubyBase.h ('k') | Source/core/rendering/RenderRubyText.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 23 matching lines...) Expand all
34 #include "core/rendering/RenderBlockFlow.h" 34 #include "core/rendering/RenderBlockFlow.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 class RenderRubyBase; 38 class RenderRubyBase;
39 class RenderRubyText; 39 class RenderRubyText;
40 40
41 // RenderRubyRun are 'inline-block/table' like objects,and wrap a single pairing of a ruby base with its ruby text(s). 41 // RenderRubyRun are 'inline-block/table' like objects,and wrap a single pairing of a ruby base with its ruby text(s).
42 // See RenderRuby.h for further comments on the structure 42 // See RenderRuby.h for further comments on the structure
43 43
44 class RenderRubyRun FINAL : public RenderBlockFlow { 44 class RenderRubyRun final : public RenderBlockFlow {
45 public: 45 public:
46 virtual ~RenderRubyRun(); 46 virtual ~RenderRubyRun();
47 47
48 bool hasRubyText() const; 48 bool hasRubyText() const;
49 bool hasRubyBase() const; 49 bool hasRubyBase() const;
50 RenderRubyText* rubyText() const; 50 RenderRubyText* rubyText() const;
51 RenderRubyBase* rubyBase() const; 51 RenderRubyBase* rubyBase() const;
52 RenderRubyBase* rubyBaseSafe(); // creates the base if it doesn't already ex ist 52 RenderRubyBase* rubyBaseSafe(); // creates the base if it doesn't already ex ist
53 53
54 virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren, Subt reeLayoutScope&) OVERRIDE; 54 virtual RenderObject* layoutSpecialExcludedChild(bool relayoutChildren, Subt reeLayoutScope&) override;
55 virtual void layout() OVERRIDE; 55 virtual void layout() override;
56 56
57 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const OVERRIDE; 57 virtual bool isChildAllowed(RenderObject*, RenderStyle*) const override;
58 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OV ERRIDE; 58 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) ov erride;
59 virtual void removeChild(RenderObject* child) OVERRIDE; 59 virtual void removeChild(RenderObject* child) override;
60 60
61 void getOverhang(bool firstLine, RenderObject* startRenderer, RenderObject* endRenderer, int& startOverhang, int& endOverhang) const; 61 void getOverhang(bool firstLine, RenderObject* startRenderer, RenderObject* endRenderer, int& startOverhang, int& endOverhang) const;
62 62
63 static RenderRubyRun* staticCreateRubyRun(const RenderObject* parentRuby); 63 static RenderRubyRun* staticCreateRubyRun(const RenderObject* parentRuby);
64 64
65 protected: 65 protected:
66 RenderRubyBase* createRubyBase() const; 66 RenderRubyBase* createRubyBase() const;
67 67
68 private: 68 private:
69 RenderRubyRun(); 69 RenderRubyRun();
70 70
71 virtual bool isRubyRun() const OVERRIDE { return true; } 71 virtual bool isRubyRun() const override { return true; }
72 virtual const char* renderName() const OVERRIDE { return "RenderRubyRun (ano nymous)"; } 72 virtual const char* renderName() const override { return "RenderRubyRun (ano nymous)"; }
73 virtual bool createsAnonymousWrapper() const OVERRIDE { return true; } 73 virtual bool createsAnonymousWrapper() const override { return true; }
74 virtual void removeLeftoverAnonymousBlock(RenderBlock*) OVERRIDE { } 74 virtual void removeLeftoverAnonymousBlock(RenderBlock*) override { }
75 }; 75 };
76 76
77 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderRubyRun, isRubyRun()); 77 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderRubyRun, isRubyRun());
78 78
79 } // namespace blink 79 } // namespace blink
80 80
81 #endif // RenderRubyRun_h 81 #endif // RenderRubyRun_h
OLDNEW
« 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