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

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

Issue 1120313003: [New Multicolumn] Simplified layout also needs to mark spanner placeholders for layout. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 7 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) 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 1989 matching lines...) Expand 10 before | Expand all | Expand 10 after
2000 // Column rules are painted by anonymous column set children of the multicol 2000 // Column rules are painted by anonymous column set children of the multicol
2001 // container. We need to notify them. 2001 // container. We need to notify them.
2002 flowThread->columnRuleStyleDidChange(); 2002 flowThread->columnRuleStyleDidChange();
2003 } 2003 }
2004 } 2004 }
2005 } 2005 }
2006 } 2006 }
2007 2007
2008 void LayoutBlockFlow::updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildre n, LayoutBox& child) 2008 void LayoutBlockFlow::updateBlockChildDirtyBitsBeforeLayout(bool relayoutChildre n, LayoutBox& child)
2009 { 2009 {
2010 if (child.isLayoutMultiColumnSpannerPlaceholder() && toLayoutMultiColumnSpan nerPlaceholder(child).layoutObjectInFlowThread()->needsLayout()) { 2010 if (child.isLayoutMultiColumnSpannerPlaceholder())
2011 // The containing block of a spanner is the multicol container (|this| b lock), but the spanner 2011 toLayoutMultiColumnSpannerPlaceholder(child).markForLayoutIfObjectInFlow ThreadNeedsLayout();
2012 // is laid out via its spanner set (|child|), so we need to make sure th at we enter it.
2013 child.setChildNeedsLayout(MarkOnlyThis);
2014 }
2015 LayoutBlock::updateBlockChildDirtyBitsBeforeLayout(relayoutChildren, child); 2012 LayoutBlock::updateBlockChildDirtyBitsBeforeLayout(relayoutChildren, child);
2016 } 2013 }
2017 2014
2018 void LayoutBlockFlow::updateStaticInlinePositionForChild(LayoutBox& child, Layou tUnit logicalTop) 2015 void LayoutBlockFlow::updateStaticInlinePositionForChild(LayoutBox& child, Layou tUnit logicalTop)
2019 { 2016 {
2020 if (child.style()->isOriginalDisplayInlineType()) 2017 if (child.style()->isOriginalDisplayInlineType())
2021 setStaticInlinePositionForChild(child, startAlignedOffsetForLine(logical Top, false)); 2018 setStaticInlinePositionForChild(child, startAlignedOffsetForLine(logical Top, false));
2022 else 2019 else
2023 setStaticInlinePositionForChild(child, startOffsetForContent()); 2020 setStaticInlinePositionForChild(child, startOffsetForContent());
2024 } 2021 }
(...skipping 1159 matching lines...) Expand 10 before | Expand all | Expand 10 after
3184 FrameView* frameView = document().view(); 3181 FrameView* frameView = document().view();
3185 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height(); 3182 LayoutUnit top = (style()->position() == FixedPosition) ? 0 : frameView->scr ollOffset().height();
3186 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( ); 3183 int visibleHeight = frameView->visibleContentRect(IncludeScrollbars).height( );
3187 if (size().height() < visibleHeight) 3184 if (size().height() < visibleHeight)
3188 top += (visibleHeight - size().height()) / 2; 3185 top += (visibleHeight - size().height()) / 2;
3189 setY(top); 3186 setY(top);
3190 dialog->setCentered(top); 3187 dialog->setCentered(top);
3191 } 3188 }
3192 3189
3193 } // namespace blink 3190 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutBlock.cpp ('k') | Source/core/layout/LayoutMultiColumnSpannerPlaceholder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698