Chromium Code Reviews| Index: Source/core/css/resolver/StyleAdjuster.cpp |
| diff --git a/Source/core/css/resolver/StyleAdjuster.cpp b/Source/core/css/resolver/StyleAdjuster.cpp |
| index dc278e60be6e74766c7a3126440e13ee641804c2..591f2cd3ac1ae78c7eedd9daac072cce1289a789 100644 |
| --- a/Source/core/css/resolver/StyleAdjuster.cpp |
| +++ b/Source/core/css/resolver/StyleAdjuster.cpp |
| @@ -152,6 +152,15 @@ static bool hasWillChangeThatCreatesStackingContext(const RenderStyle* style) |
| return false; |
| } |
| +ItemPosition StyleAdjuster::resolveAlignment(const RenderStyle* parentStyle, const RenderStyle* childStyle) |
| +{ |
| + ItemPosition align = childStyle->alignSelf(); |
| + // The auto keyword computes to the parent's align-items computed value, or to "stretch", if not set or "auto". |
| + if (align == ItemPositionAuto) |
| + align = (parentStyle->alignItems() == ItemPositionAuto) ? ItemPositionStretch : parentStyle->alignItems(); |
|
esprehn
2014/09/09 10:10:51
This is not style adjuster's job, it's not a place
|
| + return align; |
| +} |
| + |
| void StyleAdjuster::adjustRenderStyle(RenderStyle* style, RenderStyle* parentStyle, Element *e, const CachedUAStyle* cachedUAStyle) |
| { |
| ASSERT(parentStyle); |