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

Unified Diff: third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h

Issue 1420713003: Deduct pagination struts when calculating initial column height. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code review Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
diff --git a/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h b/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
index e7bb437d461c5ab623343f1090d5cc9fa7e52aba..d8d92ec568275f15892044b244bd242fd3b2f72a 100644
--- a/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
+++ b/third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.h
@@ -72,6 +72,12 @@ public:
void collectLayerFragments(PaintLayerFragments&, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect) const;
LayoutRect calculateOverflow() const;
+ enum ColumnIndexCalculationMode {
+ ClampToExistingColumns, // Stay within the range of already existing columns.
+ AssumeNewColumns // Allow column indices outside the range of already existing columns.
+ };
+ unsigned columnIndexAtOffset(LayoutUnit offsetInFlowThread, ColumnIndexCalculationMode = ClampToExistingColumns) const;
+
// The "CSS actual" value of column-count. This includes overflowing columns, if any.
unsigned actualColumnCount() const;
@@ -87,12 +93,6 @@ private:
LayoutRect flowThreadPortionRectAt(unsigned columnIndex) const;
LayoutRect flowThreadPortionOverflowRectAt(unsigned columnIndex) const;
- enum ColumnIndexCalculationMode {
- ClampToExistingColumns, // Stay within the range of already existing columns.
- AssumeNewColumns // Allow column indices outside the range of already existing columns.
- };
- unsigned columnIndexAtOffset(LayoutUnit offsetInFlowThread, ColumnIndexCalculationMode = ClampToExistingColumns) const;
-
// Return the column that the specified visual point belongs to. Only the coordinate on the
// column progression axis is relevant. Every point belongs to a column, even if said point is
// not inside any of the columns.

Powered by Google App Engine
This is Rietveld 408576698