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

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

Issue 1558963003: Recalculate column heights as part of column set layout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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) 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 372 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 clearNeedsRecalcLogicalWidthAfterLayoutChildren(); 383 clearNeedsRecalcLogicalWidthAfterLayoutChildren();
384 setPreferredLogicalWidthsDirty(MarkOnlyThis); 384 setPreferredLogicalWidthsDirty(MarkOnlyThis);
385 updateLogicalWidthAndColumnWidth(); 385 updateLogicalWidthAndColumnWidth();
386 } 386 }
387 387
388 // Expand our intrinsic height to encompass floats. 388 // Expand our intrinsic height to encompass floats.
389 if (lowestFloatLogicalBottom() > (logicalHeight() - afterEdge) && createsNew FormattingContext()) 389 if (lowestFloatLogicalBottom() > (logicalHeight() - afterEdge) && createsNew FormattingContext())
390 setLogicalHeight(lowestFloatLogicalBottom() + afterEdge); 390 setLogicalHeight(lowestFloatLogicalBottom() + afterEdge);
391 391
392 if (LayoutMultiColumnFlowThread* flowThread = multiColumnFlowThread()) { 392 if (LayoutMultiColumnFlowThread* flowThread = multiColumnFlowThread()) {
393 if (flowThread->recalculateColumnHeights()) { 393 if (flowThread->columnHeightsChanged()) {
394 setChildNeedsLayout(MarkOnlyThis); 394 setChildNeedsLayout(MarkOnlyThis);
395 return false; 395 return false;
396 } 396 }
397 } 397 }
398 398
399 if (shouldBreakAtLineToAvoidWidow()) { 399 if (shouldBreakAtLineToAvoidWidow()) {
400 setEverHadLayout(); 400 setEverHadLayout();
401 return false; 401 return false;
402 } 402 }
403 403
(...skipping 2720 matching lines...) Expand 10 before | Expand all | Expand 10 after
3124 FrameView* frameView = document().view(); 3124 FrameView* frameView = document().view();
3125 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height(); 3125 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height();
3126 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( ); 3126 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( );
3127 if (size().height() < visibleHeight) 3127 if (size().height() < visibleHeight)
3128 top += (visibleHeight - size().height()) / 2; 3128 top += (visibleHeight - size().height()) / 2;
3129 setY(top); 3129 setY(top);
3130 dialog->setCentered(top); 3130 dialog->setCentered(top);
3131 } 3131 }
3132 3132
3133 } // namespace blink 3133 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698