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

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

Issue 1709963002: [css-align] New CSS Value 'normal' for Self Alignment (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: New test for alignment and anonymous boxes. Created 4 years, 6 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/LayoutFlexibleBox.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
index faf398c52e4e3394d82c5db71d7da487920d5311..7eb27811f5c5a160ed984395f02ac5e4f4f99bc4 100644
--- a/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
+++ b/third_party/WebKit/Source/core/layout/LayoutFlexibleBox.h
@@ -80,7 +80,6 @@ public:
protected:
void computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const override;
- void styleDidChange(StyleDifference, const ComputedStyle* oldStyle) override;
void removeChild(LayoutObject*) override;
private:
@@ -142,8 +141,8 @@ private:
bool useChildAspectRatio(const LayoutBox& child) const;
LayoutUnit computeMainSizeFromAspectRatioUsing(const LayoutBox& child, Length crossSizeLength) const;
void setFlowAwareLocationForChild(LayoutBox& child, const LayoutPoint&);
- void adjustAlignmentForChild(LayoutBox& child, LayoutUnit);
ItemPosition alignmentForChild(const LayoutBox& child) const;
+ void adjustAlignmentForChild(LayoutBox& child, LayoutUnit);
LayoutUnit mainAxisBorderAndPaddingExtentForChild(const LayoutBox& child) const;
LayoutUnit computeInnerFlexBaseSizeForChild(LayoutBox& child, ChildLayoutType = LayoutIfNeeded);
bool mainAxisLengthIsDefinite(const LayoutBox& child, const Length& flexBasis) const;

Powered by Google App Engine
This is Rietveld 408576698