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

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

Issue 2866663003: [css-grid] Performance optimization on the baseline-self alignment logic
Patch Set: Remove baseline logic from intrinsic sizing alg. Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp
diff --git a/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp b/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp
index efd16f9ec7b4d176192e8615861f233e7486e981..a60049f19465f6d3161914c105f55307bd8dc10f 100644
--- a/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp
+++ b/third_party/WebKit/Source/core/layout/GridTrackSizingAlgorithm.cpp
@@ -283,8 +283,8 @@ LayoutUnit GridTrackSizingAlgorithmStrategy::LogicalHeightForChild(
child.LayoutIfNeeded();
- if (auto baseline_extent = ExtentForBaselineAlignment(child))
- return baseline_extent.value();
+ // if (auto baseline_extent = ExtentForBaselineAlignment(child))
+ // return baseline_extent.value();
return child.LogicalHeight() + child.MarginLogicalHeight();
}
@@ -314,11 +314,13 @@ LayoutUnit GridTrackSizingAlgorithmStrategy::MinContentForChild(
return child.MinPreferredLogicalWidth() + margin_logical_width;
}
+ /*
if (Direction() == kForColumns && !AvailableSpace()) {
DCHECK(GetLayoutGrid()->IsOrthogonalChild(child));
if (auto baseline_extent = ExtentForBaselineAlignment(child))
return baseline_extent.value();
}
+ */
if (UpdateOverrideContainingBlockContentSizeForChild(child,
child_inline_direction))
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698