| Index: Source/core/rendering/style/RenderStyle.h
|
| diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h
|
| index 77f718fc0368ac1706078d7c7ed86b185a67f44d..5582520e49642b6fafb6325cb8b5223e37994c03 100644
|
| --- a/Source/core/rendering/style/RenderStyle.h
|
| +++ b/Source/core/rendering/style/RenderStyle.h
|
| @@ -345,7 +345,8 @@ public:
|
| // Computes how the style change should be propagated down the tree.
|
| static StyleRecalcChange stylePropagationDiff(const RenderStyle* oldStyle, const RenderStyle* newStyle);
|
|
|
| - static ItemPosition resolveAlignment(const RenderStyle* parentStyle, const RenderStyle* childStyle);
|
| + static ItemPosition resolveAlignment(const RenderStyle* parentStyle, const RenderStyle* childStyle, ItemPosition resolvedAutoPositionForRenderer);
|
| + static ItemPosition resolveJustification(const RenderStyle* parentStyle, const RenderStyle* childStyle, ItemPosition resolvedAutoPositionForRenderer);
|
|
|
| StyleDifference visualInvalidationDiff(const RenderStyle&) const;
|
|
|
|
|