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

Side by Side Diff: Source/core/rendering/RenderFlexibleBox.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 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 25 matching lines...) Expand all
36 36
37 namespace blink { 37 namespace blink {
38 38
39 class RenderFlexibleBox : public RenderBlock { 39 class RenderFlexibleBox : public RenderBlock {
40 public: 40 public:
41 RenderFlexibleBox(Element*); 41 RenderFlexibleBox(Element*);
42 virtual ~RenderFlexibleBox(); 42 virtual ~RenderFlexibleBox();
43 43
44 static RenderFlexibleBox* createAnonymous(Document*); 44 static RenderFlexibleBox* createAnonymous(Document*);
45 45
46 virtual const char* renderName() const OVERRIDE; 46 virtual const char* renderName() const override;
47 47
48 virtual bool isFlexibleBox() const OVERRIDE FINAL { return true; } 48 virtual bool isFlexibleBox() const override final { return true; }
49 virtual bool canCollapseAnonymousBlockChild() const OVERRIDE { return false; } 49 virtual bool canCollapseAnonymousBlockChild() const override { return false; }
50 virtual void layoutBlock(bool relayoutChildren) OVERRIDE FINAL; 50 virtual void layoutBlock(bool relayoutChildren) override final;
51 51
52 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const OVERRIDE; 52 virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode , LinePositionMode = PositionOnContainingLine) const override;
53 virtual int firstLineBoxBaseline() const OVERRIDE; 53 virtual int firstLineBoxBaseline() const override;
54 virtual int inlineBlockBaseline(LineDirectionMode) const OVERRIDE; 54 virtual int inlineBlockBaseline(LineDirectionMode) const override;
55 55
56 virtual void paintChildren(PaintInfo&, const LayoutPoint&) OVERRIDE FINAL; 56 virtual void paintChildren(PaintInfo&, const LayoutPoint&) override final;
57 57
58 bool isHorizontalFlow() const; 58 bool isHorizontalFlow() const;
59 59
60 OrderIterator& orderIterator() { return m_orderIterator; } 60 OrderIterator& orderIterator() { return m_orderIterator; }
61 61
62 protected: 62 protected:
63 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const OVERRIDE; 63 virtual void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, Layo utUnit& maxLogicalWidth) const override;
64 64
65 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OV ERRIDE; 65 virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) ov erride;
66 virtual void removeChild(RenderObject*) OVERRIDE; 66 virtual void removeChild(RenderObject*) override;
67 67
68 private: 68 private:
69 enum FlexSign { 69 enum FlexSign {
70 PositiveFlexibility, 70 PositiveFlexibility,
71 NegativeFlexibility, 71 NegativeFlexibility,
72 }; 72 };
73 73
74 enum PositionedLayoutMode { 74 enum PositionedLayoutMode {
75 FlipForRowReverse, 75 FlipForRowReverse,
76 NoFlipForRowReverse, 76 NoFlipForRowReverse,
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 164
165 mutable OrderIterator m_orderIterator; 165 mutable OrderIterator m_orderIterator;
166 int m_numberOfInFlowChildrenOnFirstLine; 166 int m_numberOfInFlowChildrenOnFirstLine;
167 }; 167 };
168 168
169 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFlexibleBox, isFlexibleBox()); 169 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderFlexibleBox, isFlexibleBox());
170 170
171 } // namespace blink 171 } // namespace blink
172 172
173 #endif // RenderFlexibleBox_h 173 #endif // RenderFlexibleBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderFileUploadControl.h ('k') | Source/core/rendering/RenderFlowThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698