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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp

Issue 1429903003: Always lay out the flow thread when the multicol container is laid out. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 layoutBlockFlow->setDocumentForAnonymous(document); 171 layoutBlockFlow->setDocumentForAnonymous(document);
172 return layoutBlockFlow; 172 return layoutBlockFlow;
173 } 173 }
174 174
175 LayoutObject* LayoutBlockFlow::layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope& layoutScope) 175 LayoutObject* LayoutBlockFlow::layoutSpecialExcludedChild(bool relayoutChildren, SubtreeLayoutScope& layoutScope)
176 { 176 {
177 LayoutMultiColumnFlowThread* flowThread = multiColumnFlowThread(); 177 LayoutMultiColumnFlowThread* flowThread = multiColumnFlowThread();
178 if (!flowThread) 178 if (!flowThread)
179 return nullptr; 179 return nullptr;
180 setLogicalTopForChild(*flowThread, borderBefore() + paddingBefore()); 180 setLogicalTopForChild(*flowThread, borderBefore() + paddingBefore());
181 flowThread->layoutColumns(relayoutChildren, layoutScope); 181 flowThread->layoutColumns(layoutScope);
182 determineLogicalLeftPositionForChild(*flowThread); 182 determineLogicalLeftPositionForChild(*flowThread);
183 return flowThread; 183 return flowThread;
184 } 184 }
185 185
186 bool LayoutBlockFlow::updateLogicalWidthAndColumnWidth() 186 bool LayoutBlockFlow::updateLogicalWidthAndColumnWidth()
187 { 187 {
188 bool relayoutChildren = LayoutBlock::updateLogicalWidthAndColumnWidth(); 188 bool relayoutChildren = LayoutBlock::updateLogicalWidthAndColumnWidth();
189 if (LayoutMultiColumnFlowThread* flowThread = multiColumnFlowThread()) { 189 if (LayoutMultiColumnFlowThread* flowThread = multiColumnFlowThread()) {
190 if (flowThread->needsNewWidth()) 190 if (flowThread->needsNewWidth())
191 return true; 191 return true;
(...skipping 2851 matching lines...) Expand 10 before | Expand all | Expand 10 after
3043 FrameView* frameView = document().view(); 3043 FrameView* frameView = document().view();
3044 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height(); 3044 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height();
3045 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( ); 3045 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( );
3046 if (size().height() < visibleHeight) 3046 if (size().height() < visibleHeight)
3047 top += (visibleHeight - size().height()) / 2; 3047 top += (visibleHeight - size().height()) / 2;
3048 setY(top); 3048 setY(top);
3049 dialog->setCentered(top); 3049 dialog->setCentered(top);
3050 } 3050 }
3051 3051
3052 } // namespace blink 3052 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698