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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutMultiColumnSet.h

Issue 1558963003: Recalculate column heights as part of column set layout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 // Layout of flow thread content that's to be rendered inside this column se t begins. This 133 // Layout of flow thread content that's to be rendered inside this column se t begins. This
134 // happens at the beginning of flow thread layout, and when advancing from a previous column set 134 // happens at the beginning of flow thread layout, and when advancing from a previous column set
135 // or spanner to this one. 135 // or spanner to this one.
136 void beginFlow(LayoutUnit offsetInFlowThread); 136 void beginFlow(LayoutUnit offsetInFlowThread);
137 137
138 // Layout of flow thread content that was to be rendered inside this column set has 138 // Layout of flow thread content that was to be rendered inside this column set has
139 // finished. This happens at end of flow thread layout, and when advancing t o the next column 139 // finished. This happens at end of flow thread layout, and when advancing t o the next column
140 // set or spanner. 140 // set or spanner.
141 void endFlow(LayoutUnit offsetInFlowThread); 141 void endFlow(LayoutUnit offsetInFlowThread);
142 142
143 void layout() override;
144
143 void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const final; 145 void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const final;
144 146
145 void attachToFlowThread(); 147 void attachToFlowThread();
146 void detachFromFlowThread(); 148 void detachFromFlowThread();
147 149
148 // The top of the page nearest to the specified block offset. All in flowthr ead coordinates. 150 // The top of the page nearest to the specified block offset. All in flowthr ead coordinates.
149 LayoutUnit pageLogicalTopForOffset(LayoutUnit offset) const; 151 LayoutUnit pageLogicalTopForOffset(LayoutUnit offset) const;
150 152
151 LayoutRect fragmentsBoundingBox(const LayoutRect& boundingBoxInFlowThread) c onst; 153 LayoutRect fragmentsBoundingBox(const LayoutRect& boundingBoxInFlowThread) c onst;
152 154
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 195
194 bool m_initialHeightCalculated; 196 bool m_initialHeightCalculated;
195 }; 197 };
196 198
197 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMultiColumnSet, isLayoutMultiColumnSet()); 199 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMultiColumnSet, isLayoutMultiColumnSet());
198 200
199 } // namespace blink 201 } // namespace blink
200 202
201 #endif // LayoutMultiColumnSet_h 203 #endif // LayoutMultiColumnSet_h
202 204
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698