Index: Source/core/rendering/RenderFlexibleBox.cpp |
diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp |
index c00acbefc313719cac27c313e843e82d5934b162..9947bdb41f3e0587270a6b527920e86685c5ffb2 100644 |
--- a/Source/core/rendering/RenderFlexibleBox.cpp |
+++ b/Source/core/rendering/RenderFlexibleBox.cpp |
@@ -196,7 +196,7 @@ static ItemPosition resolveAlignment(const RenderStyle* parentStyle, const Rende |
{ |
ItemPosition align = childStyle->alignSelf(); |
if (align == ItemPositionAuto) |
- align = (parentStyle->alignItems() == ItemPositionAuto) ? ItemPositionStretch : parentStyle->alignItems(); |
+ align = parentStyle->alignItems(); |
esprehn
2014/08/19 00:56:33
What if your parent is also auto? This doesn't see
jfernandez
2014/08/19 21:39:18
It shouldn't be; the 'align-items' property value
esprehn
2014/09/03 21:45:28
That doesn't make sense, if childStyle->alignSelf(
jfernandez
2014/09/03 22:27:49
Well, it's not that it can't, but it shouldn't. Cu
|
return align; |
} |
@@ -1316,7 +1316,9 @@ void RenderFlexibleBox::alignChildren(const Vector<LineContext>& lineContexts) |
case ItemPositionLeft: |
case ItemPositionRight: |
// FIXME: File a bug about implementing that. The extended grammar |
- // is not enabled by default so we shouldn't hit this codepath. |
+ // is not implemented yet so we default to "stretch" for now. |
+ break; |
+ default: |
ASSERT_NOT_REACHED(); |
break; |
} |