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

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

Issue 1461923005: When balancing columns, we must check inner multicols for unbreakable content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: code review - std::max FTW Created 5 years 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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 // Empty the flow thread by moving everything to the parent. Remove all mult icol specific 155 // Empty the flow thread by moving everything to the parent. Remove all mult icol specific
156 // layoutObjects. Then destroy the flow thread. Called when a multicol conta iner becomes a regular 156 // layoutObjects. Then destroy the flow thread. Called when a multicol conta iner becomes a regular
157 // block. 157 // block.
158 void evacuateAndDestroy(); 158 void evacuateAndDestroy();
159 159
160 unsigned columnCount() const { return m_columnCount; } 160 unsigned columnCount() const { return m_columnCount; }
161 LayoutUnit columnHeightAvailable() const { return m_columnHeightAvailable; } 161 LayoutUnit columnHeightAvailable() const { return m_columnHeightAvailable; }
162 void setColumnHeightAvailable(LayoutUnit available) { m_columnHeightAvailabl e = available; } 162 void setColumnHeightAvailable(LayoutUnit available) { m_columnHeightAvailabl e = available; }
163 bool progressionIsInline() const { return m_progressionIsInline; } 163 bool progressionIsInline() const { return m_progressionIsInline; }
164 164
165 LayoutUnit tallestUnbreakableLogicalHeight(LayoutUnit offsetInFlowThread) co nst;
166
165 LayoutSize columnOffset(const LayoutPoint&) const final; 167 LayoutSize columnOffset(const LayoutPoint&) const final;
166 168
167 // Do we need to set a new width and lay out? 169 // Do we need to set a new width and lay out?
168 virtual bool needsNewWidth() const; 170 virtual bool needsNewWidth() const;
169 171
170 bool isPageLogicalHeightKnown() const final; 172 bool isPageLogicalHeightKnown() const final;
171 173
172 LayoutSize flowThreadTranslationAtOffset(LayoutUnit) const; 174 LayoutSize flowThreadTranslationAtOffset(LayoutUnit) const;
173 175
174 LayoutPoint visualPointToFlowThreadPoint(const LayoutPoint& visualPoint) con st override; 176 LayoutPoint visualPointToFlowThreadPoint(const LayoutPoint& visualPoint) con st override;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 bool m_isBeingEvacuated; 248 bool m_isBeingEvacuated;
247 }; 249 };
248 250
249 // Cannot use DEFINE_LAYOUT_OBJECT_TYPE_CASTS here, because isMultiColumnFlowThr ead() is defined in 251 // Cannot use DEFINE_LAYOUT_OBJECT_TYPE_CASTS here, because isMultiColumnFlowThr ead() is defined in
250 // LayoutFlowThread, not in LayoutObject. 252 // LayoutFlowThread, not in LayoutObject.
251 DEFINE_TYPE_CASTS(LayoutMultiColumnFlowThread, LayoutFlowThread, object, object- >isLayoutMultiColumnFlowThread(), object.isLayoutMultiColumnFlowThread()); 253 DEFINE_TYPE_CASTS(LayoutMultiColumnFlowThread, LayoutFlowThread, object, object- >isLayoutMultiColumnFlowThread(), object.isLayoutMultiColumnFlowThread());
252 254
253 } // namespace blink 255 } // namespace blink
254 256
255 #endif // LayoutMultiColumnFlowThread_h 257 #endif // LayoutMultiColumnFlowThread_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698