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

Side by Side Diff: Source/core/layout/LayoutRubyBase.h

Issue 1231363003: Fix virtual/override/final usage in Source/core/layout/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/layout/LayoutRuby.h ('k') | Source/core/layout/LayoutRubyRun.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 21 matching lines...) Expand all
32 #define LayoutRubyBase_h 32 #define LayoutRubyBase_h
33 33
34 #include "core/layout/LayoutBlockFlow.h" 34 #include "core/layout/LayoutBlockFlow.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 class LayoutRubyRun; 38 class LayoutRubyRun;
39 39
40 class LayoutRubyBase final : public LayoutBlockFlow { 40 class LayoutRubyBase final : public LayoutBlockFlow {
41 public: 41 public:
42 virtual ~LayoutRubyBase(); 42 ~LayoutRubyBase() override;
43
44 static LayoutRubyBase* createAnonymous(Document*); 43 static LayoutRubyBase* createAnonymous(Document*);
45 44
46 virtual const char* name() const override { return "LayoutRubyBase"; } 45 const char* name() const override { return "LayoutRubyBase"; }
47 46
48 virtual bool isOfType(LayoutObjectType type) const override { return type == LayoutObjectRubyBase || LayoutBlockFlow::isOfType(type); } 47 bool isOfType(LayoutObjectType type) const override { return type == LayoutO bjectRubyBase || LayoutBlockFlow::isOfType(type); }
49 48
50 virtual bool isChildAllowed(LayoutObject*, const ComputedStyle&) const overr ide; 49 bool isChildAllowed(LayoutObject*, const ComputedStyle&) const override;
51 50
52 private: 51 private:
53 LayoutRubyBase(); 52 LayoutRubyBase();
54 53
55 virtual ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const overri de; 54 ETextAlign textAlignmentForLine(bool endsWithSoftBreak) const override;
56 virtual void adjustInlineDirectionLineBounds(unsigned expansionOpportunityCo unt, LayoutUnit& logicalLeft, LayoutUnit& logicalWidth) const override; 55 void adjustInlineDirectionLineBounds(unsigned expansionOpportunityCount, Lay outUnit& logicalLeft, LayoutUnit& logicalWidth) const override;
57 56
58 void moveChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = nullpt r); 57 void moveChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = nullpt r);
59 void moveInlineChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = nullptr); 58 void moveInlineChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = nullptr);
60 void moveBlockChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = n ullptr); 59 void moveBlockChildren(LayoutRubyBase* toBase, LayoutObject* beforeChild = n ullptr);
61 60
62 // Allow LayoutRubyRun to manipulate the children within ruby bases. 61 // Allow LayoutRubyRun to manipulate the children within ruby bases.
63 friend class LayoutRubyRun; 62 friend class LayoutRubyRun;
64 }; 63 };
65 64
66 } // namespace blink 65 } // namespace blink
67 66
68 #endif // LayoutRubyBase_h 67 #endif // LayoutRubyBase_h
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutRuby.h ('k') | Source/core/layout/LayoutRubyRun.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698