Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1103)

Unified Diff: Source/core/rendering/RenderFlexibleBox.cpp

Issue 433153003: [CSS Grid Layout] Don't resolve align-self and justify-self properties (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Applied suggested comments. Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/resolver/StyleAdjuster.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderFlexibleBox.cpp
diff --git a/Source/core/rendering/RenderFlexibleBox.cpp b/Source/core/rendering/RenderFlexibleBox.cpp
index 644696facbe1bee7c8cbc791e9ad8c2f4bb10ed7..69211a6d5697073f00928db42083ff57d152e4d7 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() == ItemPositionAuto) ? ItemPositionStretch: parentStyle->alignItems();
return align;
}
@@ -1320,7 +1320,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;
}
« no previous file with comments | « Source/core/css/resolver/StyleAdjuster.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698