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

Side by Side Diff: Source/core/rendering/RenderMultiColumnSet.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) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 // Being a "region", a column set has no children on its own, but is merely used to slice a portion 43 // Being a "region", a column set has no children on its own, but is merely used to slice a portion
44 // of the tall "single-column" flow thread into actual columns visually, to conv ert from flow thread 44 // of the tall "single-column" flow thread into actual columns visually, to conv ert from flow thread
45 // coordinates to visual ones. It is in charge of both positioning columns corre ctly relatively to 45 // coordinates to visual ones. It is in charge of both positioning columns corre ctly relatively to
46 // the parent multicol container, and to calculate the correct translation for e ach column's 46 // the parent multicol container, and to calculate the correct translation for e ach column's
47 // contents, and to paint any rules between them. RenderMultiColumnSet objects a re used for 47 // contents, and to paint any rules between them. RenderMultiColumnSet objects a re used for
48 // painting, hit testing, and any other type of operation that requires mapping from flow thread 48 // painting, hit testing, and any other type of operation that requires mapping from flow thread
49 // coordinates to visual coordinates. 49 // coordinates to visual coordinates.
50 // 50 //
51 // Column spans result in the creation of new column sets, since a spanning rend erer has to be 51 // Column spans result in the creation of new column sets, since a spanning rend erer has to be
52 // placed in between the column sets that come before and after the span. 52 // placed in between the column sets that come before and after the span.
53 class RenderMultiColumnSet FINAL : public RenderRegion { 53 class RenderMultiColumnSet final : public RenderRegion {
54 public: 54 public:
55 enum BalancedHeightCalculation { GuessFromFlowThreadPortion, StretchBySpaceS hortage }; 55 enum BalancedHeightCalculation { GuessFromFlowThreadPortion, StretchBySpaceS hortage };
56 56
57 static RenderMultiColumnSet* createAnonymous(RenderFlowThread*, RenderStyle* parentStyle); 57 static RenderMultiColumnSet* createAnonymous(RenderFlowThread*, RenderStyle* parentStyle);
58 58
59 virtual bool isRenderMultiColumnSet() const OVERRIDE { return true; } 59 virtual bool isRenderMultiColumnSet() const override { return true; }
60 60
61 virtual LayoutUnit pageLogicalWidth() const OVERRIDE FINAL { return flowThre ad()->logicalWidth(); } 61 virtual LayoutUnit pageLogicalWidth() const override final { return flowThre ad()->logicalWidth(); }
62 virtual LayoutUnit pageLogicalHeight() const OVERRIDE FINAL { return m_colum nHeight; } 62 virtual LayoutUnit pageLogicalHeight() const override final { return m_colum nHeight; }
63 63
64 RenderBlockFlow* multiColumnBlockFlow() const { return toRenderBlockFlow(par ent()); } 64 RenderBlockFlow* multiColumnBlockFlow() const { return toRenderBlockFlow(par ent()); }
65 RenderMultiColumnFlowThread* multiColumnFlowThread() const 65 RenderMultiColumnFlowThread* multiColumnFlowThread() const
66 { 66 {
67 ASSERT_WITH_SECURITY_IMPLICATION(!flowThread() || flowThread()->isRender MultiColumnFlowThread()); 67 ASSERT_WITH_SECURITY_IMPLICATION(!flowThread() || flowThread()->isRender MultiColumnFlowThread());
68 return static_cast<RenderMultiColumnFlowThread*>(flowThread()); 68 return static_cast<RenderMultiColumnFlowThread*>(flowThread());
69 } 69 }
70 70
71 RenderMultiColumnSet* nextSiblingMultiColumnSet() const; 71 RenderMultiColumnSet* nextSiblingMultiColumnSet() const;
72 RenderMultiColumnSet* previousSiblingMultiColumnSet() const; 72 RenderMultiColumnSet* previousSiblingMultiColumnSet() const;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 void collectLayerFragments(LayerFragments&, const LayoutRect& layerBoundingB ox, const LayoutRect& dirtyRect); 123 void collectLayerFragments(LayerFragments&, const LayoutRect& layerBoundingB ox, const LayoutRect& dirtyRect);
124 124
125 LayoutUnit columnGap() const; 125 LayoutUnit columnGap() const;
126 126
127 // The "CSS actual" value of column-count. This includes overflowing columns , if any. 127 // The "CSS actual" value of column-count. This includes overflowing columns , if any.
128 unsigned actualColumnCount() const; 128 unsigned actualColumnCount() const;
129 129
130 private: 130 private:
131 RenderMultiColumnSet(RenderFlowThread*); 131 RenderMultiColumnSet(RenderFlowThread*);
132 132
133 virtual void insertedIntoTree() OVERRIDE FINAL; 133 virtual void insertedIntoTree() override final;
134 virtual void willBeRemovedFromTree() OVERRIDE FINAL; 134 virtual void willBeRemovedFromTree() override final;
135 135
136 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const OVERRIDE; 136 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const override;
137 137
138 virtual void paintObject(PaintInfo&, const LayoutPoint& paintOffset) OVERRID E; 138 virtual void paintObject(PaintInfo&, const LayoutPoint& paintOffset) overrid e;
139 139
140 virtual void addOverflowFromChildren() OVERRIDE; 140 virtual void addOverflowFromChildren() override;
141 141
142 virtual const char* renderName() const OVERRIDE; 142 virtual const char* renderName() const override;
143 143
144 LayoutUnit calculateMaxColumnHeight() const; 144 LayoutUnit calculateMaxColumnHeight() const;
145 LayoutRect columnRectAt(unsigned index) const; 145 LayoutRect columnRectAt(unsigned index) const;
146 146
147 147
148 LayoutRect flowThreadPortionRectAt(unsigned index) const; 148 LayoutRect flowThreadPortionRectAt(unsigned index) const;
149 LayoutRect flowThreadPortionOverflowRect(const LayoutRect& flowThreadPortion , unsigned index, unsigned colCount, LayoutUnit colGap) const; 149 LayoutRect flowThreadPortionOverflowRect(const LayoutRect& flowThreadPortion , unsigned index, unsigned colCount, LayoutUnit colGap) const;
150 150
151 enum ColumnIndexCalculationMode { 151 enum ColumnIndexCalculationMode {
152 ClampToExistingColumns, // Stay within the range of already existing col umns. 152 ClampToExistingColumns, // Stay within the range of already existing col umns.
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 }; 201 };
202 Vector<ContentRun, 1> m_contentRuns; 202 Vector<ContentRun, 1> m_contentRuns;
203 }; 203 };
204 204
205 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMultiColumnSet, isRenderMultiColumnSet()); 205 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMultiColumnSet, isRenderMultiColumnSet());
206 206
207 } // namespace blink 207 } // namespace blink
208 208
209 #endif // RenderMultiColumnSet_h 209 #endif // RenderMultiColumnSet_h
210 210
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderMultiColumnFlowThread.h ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698