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

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

Issue 855413002: [New Multicolumn] Support for block direction margins on spanners. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: code review - add descriptions to tests. Created 5 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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 // The "CSS actual" value of column-count. This includes overflowing columns , if any. 139 // The "CSS actual" value of column-count. This includes overflowing columns , if any.
140 unsigned actualColumnCount() const; 140 unsigned actualColumnCount() const;
141 141
142 protected: 142 protected:
143 RenderMultiColumnSet(RenderFlowThread*); 143 RenderMultiColumnSet(RenderFlowThread*);
144 144
145 private: 145 private:
146 virtual void insertedIntoTree() override final; 146 virtual void insertedIntoTree() override final;
147 virtual void willBeRemovedFromTree() override final; 147 virtual void willBeRemovedFromTree() override final;
148 148
149 virtual bool isSelfCollapsingBlock() const override { return false; }
150
149 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const override; 151 virtual void computeLogicalHeight(LayoutUnit logicalHeight, LayoutUnit logic alTop, LogicalExtentComputedValues&) const override;
150 152
151 virtual void paintObject(const PaintInfo&, const LayoutPoint& paintOffset) o verride; 153 virtual void paintObject(const PaintInfo&, const LayoutPoint& paintOffset) o verride;
152 154
153 virtual void addOverflowFromChildren() override; 155 virtual void addOverflowFromChildren() override;
154 156
155 virtual const char* renderName() const override; 157 virtual const char* renderName() const override;
156 158
157 LayoutUnit calculateMaxColumnHeight() const; 159 LayoutUnit calculateMaxColumnHeight() const;
158 LayoutRect columnRectAt(unsigned index) const; 160 LayoutRect columnRectAt(unsigned index) const;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 // initial margin collapsing estimates were wrong. 232 // initial margin collapsing estimates were wrong.
231 setLogicalBottomInFlowThread(offsetInFlowThread); 233 setLogicalBottomInFlowThread(offsetInFlowThread);
232 } 234 }
233 235
234 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMultiColumnSet, isRenderMultiColumnSet()); 236 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMultiColumnSet, isRenderMultiColumnSet());
235 237
236 } // namespace blink 238 } // namespace blink
237 239
238 #endif // RenderMultiColumnSet_h 240 #endif // RenderMultiColumnSet_h
239 241
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBox.cpp ('k') | Source/core/rendering/RenderMultiColumnSpannerPlaceholder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698