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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutGrid.cpp

Issue 2832783003: [css-grid] Clearing the override height before layout (Closed)
Patch Set: Patch rebased. Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/LayoutGrid.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
index dfae28ff5f41fbd9cfb5479e3ec7a9db887256bd..9b70c14246c0977c6e1645927061b89b3aec95f0 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.cpp
@@ -249,19 +249,22 @@ void LayoutGrid::UpdateBlockLayout(bool relayout_children) {
LayoutSize previous_size = Size();
has_definite_logical_height_ = HasDefiniteLogicalHeight();
- // We need to clear both own and containingBlock override sizes to
- // ensure we get the same result when grid's intrinsic size is
- // computed again in the updateLogicalWidth call bellow.
- if (SizesLogicalWidthToFitContent(StyleRef().LogicalWidth()) ||
- StyleRef().LogicalWidth().IsIntrinsicOrAuto()) {
- for (auto* child = FirstInFlowChildBox(); child;
- child = child->NextInFlowSiblingBox()) {
- if (!IsOrthogonalChild(*child))
- continue;
- child->ClearOverrideSize();
- child->ClearContainingBlockOverrideSize();
- child->ForceLayout();
- }
+ // Grid's layout logic controls the grid item's override size, hence
+ // we need to clear any override size set previously, so it doesn't
+ // interfere in current layout execution.
+ for (auto* child = FirstInFlowChildBox(); child;
+ child = child->NextInFlowSiblingBox()) {
+ child->ClearOverrideSize();
+ if (!IsOrthogonalChild(*child) ||
+ (!SizesLogicalWidthToFitContent(StyleRef().LogicalWidth()) &&
+ !StyleRef().LogicalWidth().IsIntrinsicOrAuto()))
+ continue;
+ // Additionally, we may need to clear containingBlock override sizes and
+ // force a layout of the grid items to ensure we get the same result when
+ // grid's intrinsic size is computed again in the updateLogicalWidth call
+ // bellow.
+ child->ClearContainingBlockOverrideSize();
+ child->ForceLayout();
}
UpdateLogicalWidth();
@@ -1576,11 +1579,6 @@ GridTrackSizingDirection LayoutGrid::FlowAwareDirectionForChild(
// FIXME: This logic is shared by LayoutFlexibleBox, so it should be moved to
// LayoutBox.
void LayoutGrid::ApplyStretchAlignmentToChildIfNeeded(LayoutBox& child) {
- // We clear height override values because we will decide now whether it's
- // allowed or not, evaluating the conditions which might have changed since
- // the old values were set.
- child.ClearOverrideLogicalContentHeight();
-
GridTrackSizingDirection child_block_direction =
FlowAwareDirectionForChild(child, kForRows);
bool block_flow_is_column_axis = child_block_direction == kForRows;
« no previous file with comments | « third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698