| Index: Source/core/style/ComputedStyle.h
|
| diff --git a/Source/core/style/ComputedStyle.h b/Source/core/style/ComputedStyle.h
|
| index 64abb5eb0ef055f4949c15f8119748e51432bb07..d1cb59cf432830a5ffc9aa2b2df072726fb6ca45 100644
|
| --- a/Source/core/style/ComputedStyle.h
|
| +++ b/Source/core/style/ComputedStyle.h
|
| @@ -351,8 +351,14 @@ public:
|
| // Computes how the style change should be propagated down the tree.
|
| static StyleRecalcChange stylePropagationDiff(const ComputedStyle* oldStyle, const ComputedStyle* newStyle);
|
|
|
| - static ItemPosition resolveAlignment(const ComputedStyle& parentStyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject);
|
| - static ItemPosition resolveJustification(const ComputedStyle& parentStyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject);
|
| + ContentPosition resolvedAlignContentPosition() const;
|
| + ContentDistributionType resolvedAlignContentDistribution() const;
|
| + ContentPosition resolvedJustifyContentPosition() const;
|
| + ContentDistributionType resolvedJustifyContentDistribution() const;
|
| + static ItemPosition resolvedAlignSelfPosition(const ComputedStyle& parentStyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject);
|
| + static OverflowAlignment resolvedAlignSelfOverflow(const ComputedStyle& parentStyle, const ComputedStyle& childStyle);
|
| + static ItemPosition resolvedJustifySelfPosition(const ComputedStyle& parentStyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject);
|
| + static OverflowAlignment resolvedJustifySelfOverflow(const ComputedStyle& parentStyle, const ComputedStyle& childStyle);
|
|
|
| StyleDifference visualInvalidationDiff(const ComputedStyle&) const;
|
|
|
|
|