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

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

Issue 601623002: Move paint code from RenderMultiColumnSet to MultiColumnSetPainter. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Merged Created 6 years, 3 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
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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 120
121 void paintInvalidationForFlowThreadContent(const LayoutRect& paintInvalidati onRect) const; 121 void paintInvalidationForFlowThreadContent(const LayoutRect& paintInvalidati onRect) const;
122 122
123 // The top of the nearest page inside the region. For RenderRegions, this is just the logical top of the 123 // The top of the nearest page inside the region. For RenderRegions, this is just the logical top of the
124 // flow thread portion we contain. For sets, we have to figure out the top o f the nearest column or 124 // flow thread portion we contain. For sets, we have to figure out the top o f the nearest column or
125 // page. 125 // page.
126 LayoutUnit pageLogicalTopForOffset(LayoutUnit offset) const; 126 LayoutUnit pageLogicalTopForOffset(LayoutUnit offset) const;
127 127
128 void collectLayerFragments(LayerFragments&, const LayoutRect& layerBoundingB ox, const LayoutRect& dirtyRect); 128 void collectLayerFragments(LayerFragments&, const LayoutRect& layerBoundingB ox, const LayoutRect& dirtyRect);
129 129
130 LayoutUnit columnGap() const;
131
132 // The "CSS actual" value of column-count. This includes overflowing columns , if any.
133 unsigned actualColumnCount() const;
134
130 private: 135 private:
131 RenderMultiColumnSet(RenderFlowThread*); 136 RenderMultiColumnSet(RenderFlowThread*);
132 137
133 virtual void insertedIntoTree() OVERRIDE FINAL; 138 virtual void insertedIntoTree() OVERRIDE FINAL;
134 virtual void willBeRemovedFromTree() OVERRIDE FINAL; 139 virtual void willBeRemovedFromTree() OVERRIDE FINAL;
135 140
136 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const OVERRIDE; 141 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const OVERRIDE;
137 142
138 virtual void paintObject(PaintInfo&, const LayoutPoint& paintOffset) OVERRID E; 143 virtual void paintObject(PaintInfo&, const LayoutPoint& paintOffset) OVERRID E;
139 144
140 virtual void addOverflowFromChildren() OVERRIDE; 145 virtual void addOverflowFromChildren() OVERRIDE;
141 146
142 virtual const char* renderName() const OVERRIDE; 147 virtual const char* renderName() const OVERRIDE;
143 148
144 void paintColumnRules(PaintInfo&, const LayoutPoint& paintOffset);
145
146 LayoutUnit calculateMaxColumnHeight() const; 149 LayoutUnit calculateMaxColumnHeight() const;
147 LayoutUnit columnGap() const;
148 LayoutRect columnRectAt(unsigned index) const; 150 LayoutRect columnRectAt(unsigned index) const;
149 151
150 // The "CSS actual" value of column-count. This includes overflowing columns , if any.
151 unsigned actualColumnCount() const;
152 152
153 LayoutRect flowThreadPortionRectAt(unsigned index) const; 153 LayoutRect flowThreadPortionRectAt(unsigned index) const;
154 LayoutRect flowThreadPortionOverflowRect(const LayoutRect& flowThreadPortion , unsigned index, unsigned colCount, LayoutUnit colGap) const; 154 LayoutRect flowThreadPortionOverflowRect(const LayoutRect& flowThreadPortion , unsigned index, unsigned colCount, LayoutUnit colGap) const;
155 155
156 enum ColumnIndexCalculationMode { 156 enum ColumnIndexCalculationMode {
157 ClampToExistingColumns, // Stay within the range of already existing col umns. 157 ClampToExistingColumns, // Stay within the range of already existing col umns.
158 AssumeNewColumns // Allow column indices outside the range of already ex isting columns. 158 AssumeNewColumns // Allow column indices outside the range of already ex isting columns.
159 }; 159 };
160 unsigned columnIndexAtOffset(LayoutUnit, ColumnIndexCalculationMode = ClampT oExistingColumns) const; 160 unsigned columnIndexAtOffset(LayoutUnit, ColumnIndexCalculationMode = ClampT oExistingColumns) const;
161 161
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 }; 206 };
207 Vector<ContentRun, 1> m_contentRuns; 207 Vector<ContentRun, 1> m_contentRuns;
208 }; 208 };
209 209
210 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMultiColumnSet, isRenderMultiColumnSet()); 210 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMultiColumnSet, isRenderMultiColumnSet());
211 211
212 } // namespace blink 212 } // namespace blink
213 213
214 #endif // RenderMultiColumnSet_h 214 #endif // RenderMultiColumnSet_h
215 215
OLDNEW
« no previous file with comments | « Source/core/paint/MultiColumnSetPainter.cpp ('k') | Source/core/rendering/RenderMultiColumnSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698