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

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
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 supportsPartialLayout() const OVERRIDE { return false; } 68 virtual bool supportsPartialLayout() const OVERRIDE { return false; }
69 virtual bool createsAnonymousWrapper() const { return true; } 69 virtual bool createsAnonymousWrapper() const OVERRIDE { return true; }
70 virtual void removeLeftoverAnonymousBlock(RenderBlock*) { ASSERT_NOT_REACHED (); }
71 }; 70 };
72 71
73 // <ruby> when used as 'display:block' or 'display:inline-block' 72 // <ruby> when used as 'display:block' or 'display:inline-block'
74 class RenderRubyAsBlock FINAL : public RenderBlockFlow { 73 class RenderRubyAsBlock FINAL : public RenderBlockFlow {
75 public: 74 public:
76 RenderRubyAsBlock(Element*); 75 RenderRubyAsBlock(Element*);
77 virtual ~RenderRubyAsBlock(); 76 virtual ~RenderRubyAsBlock();
78 77
79 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0); 78 virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) OV ERRIDE;
80 virtual void removeChild(RenderObject* child); 79 virtual void removeChild(RenderObject* child) OVERRIDE;
81 80
82 protected: 81 protected:
83 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); 82 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE;
84 83
85 private: 84 private:
86 virtual bool isRuby() const { return true; } 85 virtual bool isRuby() const OVERRIDE { return true; }
87 virtual const char* renderName() const { return "RenderRuby (block)"; } 86 virtual const char* renderName() const OVERRIDE { return "RenderRuby (block) "; }
88 virtual bool supportsPartialLayout() const OVERRIDE { return false; } 87 virtual bool supportsPartialLayout() const OVERRIDE { return false; }
89 virtual bool createsAnonymousWrapper() const { return true; } 88 virtual bool createsAnonymousWrapper() const OVERRIDE { return true; }
90 virtual void removeLeftoverAnonymousBlock(RenderBlock*) { ASSERT_NOT_REACHED (); } 89 virtual void removeLeftoverAnonymousBlock(RenderBlock*) OVERRIDE { ASSERT_NO T_REACHED(); }
91 }; 90 };
92 91
93 } // namespace WebCore 92 } // namespace WebCore
94 93
95 #endif // RenderRuby_h 94 #endif // RenderRuby_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698