Index: Source/core/rendering/style/RenderStyle.h |
diff --git a/Source/core/rendering/style/RenderStyle.h b/Source/core/rendering/style/RenderStyle.h |
index b63388337df13da2fb11621997573a2c382b9530..eb4fcd39525fe1f5c1007c68e472cc849fad6627 100644 |
--- a/Source/core/rendering/style/RenderStyle.h |
+++ b/Source/core/rendering/style/RenderStyle.h |
@@ -346,7 +346,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 defaultPosition = ItemPositionStretch); |
+ static ItemPosition resolveJustification(const RenderStyle* parentStyle, const RenderStyle* childStyle, ItemPosition defaultPosition = ItemPositionStretch); |
Julien - ping for review
2014/10/31 17:17:13
The default parameter seems very artificial (why I
jfernandez
2014/10/31 22:55:59
I agree is not the best approach, but I couldn't c
|
StyleDifference visualInvalidationDiff(const RenderStyle&) const; |