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; |