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

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

Issue 2913093002: Revert of [css-align] Don't resolve 'auto' values for computed style. (Closed)
Patch Set: 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
Index: third_party/WebKit/Source/core/layout/LayoutGrid.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutGrid.h b/third_party/WebKit/Source/core/layout/LayoutGrid.h
index 767b5bff6f3b99104c6ea00f68c23c414351a909..34b5414d604dc05e004ba0ce788b2953dcb238e3 100644
--- a/third_party/WebKit/Source/core/layout/LayoutGrid.h
+++ b/third_party/WebKit/Source/core/layout/LayoutGrid.h
@@ -128,14 +128,6 @@
LayoutObject* before_child = nullptr) override;
void RemoveChild(LayoutObject*) override;
- bool SelfAlignmentChangedToStretch(GridAxis,
- const ComputedStyle& old_style,
- const ComputedStyle& new_style,
- const LayoutBox&) const;
- bool SelfAlignmentChangedFromStretch(GridAxis,
- const ComputedStyle& old_style,
- const ComputedStyle& new_style,
- const LayoutBox&) const;
void StyleDidChange(StyleDifference, const ComputedStyle*) override;
Optional<LayoutUnit> AvailableSpaceForGutters(GridTrackSizingDirection) const;
@@ -219,16 +211,8 @@
LayoutUnit AvailableAlignmentSpaceForChildBeforeStretching(
LayoutUnit grid_area_breadth_for_child,
const LayoutBox&) const;
- StyleSelfAlignmentData JustifySelfForChild(
- const LayoutBox&,
- const ComputedStyle* = nullptr) const;
- StyleSelfAlignmentData AlignSelfForChild(
- const LayoutBox&,
- const ComputedStyle* = nullptr) const;
- StyleSelfAlignmentData SelfAlignmentForChild(
- GridAxis,
- const LayoutBox& child,
- const ComputedStyle* = nullptr) const;
+ StyleSelfAlignmentData JustifySelfForChild(const LayoutBox&) const;
+ StyleSelfAlignmentData AlignSelfForChild(const LayoutBox&) const;
void ApplyStretchAlignmentToChildIfNeeded(LayoutBox&);
bool HasAutoSizeInColumnAxis(const LayoutBox& child) const {
return IsHorizontalWritingMode() ? child.StyleRef().Height().IsAuto()
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutGrid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698