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

Side by Side Diff: Source/core/rendering/RenderRuby.h

Issue 129173004: Update rendering classes to use OVERRIDE / FINAL when needed (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 11 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/RenderReplica.h ('k') | Source/core/rendering/RenderRubyBase.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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // Note: <rp> elements are defined as having 'display:none' and thus normally ar e not assigned a renderer. 49 // Note: <rp> elements are defined as having 'display:none' and thus normally ar e not assigned a renderer.
50 // 50 //
51 // Generated :before/:after content is shunted into anonymous inline blocks 51 // Generated :before/:after content is shunted into anonymous inline blocks
52 52
53 // <ruby> when used as 'display:inline' 53 // <ruby> when used as 'display:inline'
54 class RenderRubyAsInline FINAL : public RenderInline { 54 class RenderRubyAsInline FINAL : public RenderInline {
55 public: 55 public:
56 RenderRubyAsInline(Element*); 56 RenderRubyAsInline(Element*);
57 virtual ~RenderRubyAsInline(); 57 virtual ~RenderRubyAsInline();
58 58
59 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0); 59 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OV ERRIDE;
60 virtual void removeChild(RenderObject* child); 60 virtual void removeChild(RenderObject* child) OVERRIDE;
61 61
62 protected: 62 protected:
63 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 63 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;
64 64
65 private: 65 private:
66 virtual bool isRuby() const { return true; } 66 virtual bool isRuby() const OVERRIDE { return true; }
67 virtual const char* renderName() const { return "RenderRuby (inline)"; } 67 virtual const char* renderName() const OVERRIDE { return "RenderRuby (inline )"; }
68 virtual bool createsAnonymousWrapper() const { return true; } 68 virtual bool createsAnonymousWrapper() const OVERRIDE { return true; }
69 virtual void removeLeftoverAnonymousBlock(RenderBlock*) { ASSERT_NOT_REACHED (); }
70 }; 69 };
71 70
72 // <ruby> when used as 'display:block' or 'display:inline-block' 71 // <ruby> when used as 'display:block' or 'display:inline-block'
73 class RenderRubyAsBlock FINAL : public RenderBlockFlow { 72 class RenderRubyAsBlock FINAL : public RenderBlockFlow {
74 public: 73 public:
75 RenderRubyAsBlock(Element*); 74 RenderRubyAsBlock(Element*);
76 virtual ~RenderRubyAsBlock(); 75 virtual ~RenderRubyAsBlock();
77 76
78 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0); 77 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OV ERRIDE;
79 virtual void removeChild(RenderObject* child); 78 virtual void removeChild(RenderObject* child) OVERRIDE;
80 79
81 protected: 80 protected:
82 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 81 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;
83 82
84 private: 83 private:
85 virtual bool isRuby() const { return true; } 84 virtual bool isRuby() const OVERRIDE { return true; }
86 virtual const char* renderName() const { return "RenderRuby (block)"; } 85 virtual const char* renderName() const OVERRIDE { return "RenderRuby (block) "; }
87 virtual bool supportsPartialLayout() const OVERRIDE { return false; } 86 virtual bool supportsPartialLayout() const OVERRIDE { return false; }
88 virtual bool createsAnonymousWrapper() const { return true; } 87 virtual bool createsAnonymousWrapper() const OVERRIDE { return true; }
89 virtual void removeLeftoverAnonymousBlock(RenderBlock*) { ASSERT_NOT_REACHED (); } 88 virtual void removeLeftoverAnonymousBlock(RenderBlock*) OVERRIDE { ASSERT_NO T_REACHED(); }
90 }; 89 };
91 90
92 } // namespace WebCore 91 } // namespace WebCore
93 92
94 #endif // RenderRuby_h 93 #endif // RenderRuby_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderReplica.h ('k') | Source/core/rendering/RenderRubyBase.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698