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

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

Issue 1266553002: Include overflow when setting the logical flowthread bottom on the last column set. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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 | Annotate | Revision Log
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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 // Layout of flow thread content that's to be rendered inside this column se t begins. This 130 // Layout of flow thread content that's to be rendered inside this column se t begins. This
131 // happens at the beginning of flow thread layout, and when advancing from a previous column set 131 // happens at the beginning of flow thread layout, and when advancing from a previous column set
132 // or spanner to this one. 132 // or spanner to this one.
133 void beginFlow(LayoutUnit offsetInFlowThread); 133 void beginFlow(LayoutUnit offsetInFlowThread);
134 134
135 // Layout of flow thread content that was to be rendered inside this column set has 135 // Layout of flow thread content that was to be rendered inside this column set has
136 // finished. This happens at end of flow thread layout, and when advancing t o the next column 136 // finished. This happens at end of flow thread layout, and when advancing t o the next column
137 // set or spanner. 137 // set or spanner.
138 void endFlow(LayoutUnit offsetInFlowThread); 138 void endFlow(LayoutUnit offsetInFlowThread);
139 139
140 // Expand this set's flow thread portion rectangle to contain all trailing f low thread
141 // overflow. Only to be called on the last set.
142 void expandToEncompassFlowThreadContentsIfNeeded();
143
144 void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const final; 140 void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const final;
145 141
146 void attachToFlowThread(); 142 void attachToFlowThread();
147 void detachFromFlowThread(); 143 void detachFromFlowThread();
148 144
149 // The top of the page nearest to the specified block offset. All in flowthr ead coordinates. 145 // The top of the page nearest to the specified block offset. All in flowthr ead coordinates.
150 LayoutUnit pageLogicalTopForOffset(LayoutUnit offset) const; 146 LayoutUnit pageLogicalTopForOffset(LayoutUnit offset) const;
151 147
152 void collectLayerFragments(DeprecatedPaintLayerFragments&, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect); 148 void collectLayerFragments(DeprecatedPaintLayerFragments&, const LayoutRect& layerBoundingBox, const LayoutRect& dirtyRect);
153 149
(...skipping 23 matching lines...) Expand all
177 MultiColumnFragmentainerGroupList m_fragmentainerGroups; 173 MultiColumnFragmentainerGroupList m_fragmentainerGroups;
178 LayoutFlowThread* m_flowThread; 174 LayoutFlowThread* m_flowThread;
179 }; 175 };
180 176
181 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMultiColumnSet, isLayoutMultiColumnSet()); 177 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMultiColumnSet, isLayoutMultiColumnSet());
182 178
183 } // namespace blink 179 } // namespace blink
184 180
185 #endif // LayoutMultiColumnSet_h 181 #endif // LayoutMultiColumnSet_h
186 182
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutMultiColumnFlowThread.cpp ('k') | Source/core/layout/LayoutMultiColumnSet.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698