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

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

Issue 1887793002: Correct inline-block baseline calculation for multicol containers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 178
179 // Do we need to set a new width and lay out? 179 // Do we need to set a new width and lay out?
180 virtual bool needsNewWidth() const; 180 virtual bool needsNewWidth() const;
181 181
182 bool isPageLogicalHeightKnown() const final; 182 bool isPageLogicalHeightKnown() const final;
183 183
184 LayoutSize flowThreadTranslationAtOffset(LayoutUnit) const; 184 LayoutSize flowThreadTranslationAtOffset(LayoutUnit) const;
185 185
186 LayoutPoint visualPointToFlowThreadPoint(const LayoutPoint& visualPoint) con st override; 186 LayoutPoint visualPointToFlowThreadPoint(const LayoutPoint& visualPoint) con st override;
187 187
188 int inlineBlockBaseline(LineDirectionMode) const override;
189
188 LayoutMultiColumnSet* columnSetAtBlockOffset(LayoutUnit) const final; 190 LayoutMultiColumnSet* columnSetAtBlockOffset(LayoutUnit) const final;
189 191
190 void layoutColumns(SubtreeLayoutScope&); 192 void layoutColumns(SubtreeLayoutScope&);
191 193
192 // Skip past a column spanner during flow thread layout. Spanners are not la id out inside the 194 // Skip past a column spanner during flow thread layout. Spanners are not la id out inside the
193 // flow thread, since the flow thread is not in a spanner's containing block chain (since the 195 // flow thread, since the flow thread is not in a spanner's containing block chain (since the
194 // containing block is the multicol container). 196 // containing block is the multicol container).
195 void skipColumnSpanner(LayoutBox*, LayoutUnit logicalTopInFlowThread); 197 void skipColumnSpanner(LayoutBox*, LayoutUnit logicalTopInFlowThread);
196 198
197 // Returns true if at least one column got a new height after flow thread la yout (during column 199 // Returns true if at least one column got a new height after flow thread la yout (during column
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 bool m_isBeingEvacuated; 269 bool m_isBeingEvacuated;
268 }; 270 };
269 271
270 // Cannot use DEFINE_LAYOUT_OBJECT_TYPE_CASTS here, because isMultiColumnFlowThr ead() is defined in 272 // Cannot use DEFINE_LAYOUT_OBJECT_TYPE_CASTS here, because isMultiColumnFlowThr ead() is defined in
271 // LayoutFlowThread, not in LayoutObject. 273 // LayoutFlowThread, not in LayoutObject.
272 DEFINE_TYPE_CASTS(LayoutMultiColumnFlowThread, LayoutFlowThread, object, object- >isLayoutMultiColumnFlowThread(), object.isLayoutMultiColumnFlowThread()); 274 DEFINE_TYPE_CASTS(LayoutMultiColumnFlowThread, LayoutFlowThread, object, object- >isLayoutMultiColumnFlowThread(), object.isLayoutMultiColumnFlowThread());
273 275
274 } // namespace blink 276 } // namespace blink
275 277
276 #endif // LayoutMultiColumnFlowThread_h 278 #endif // LayoutMultiColumnFlowThread_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698