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

Unified Diff: Source/core/layout/LayoutGrid.cpp

Issue 1070143002: [Alignment] Single class for holding the alignment data. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased and got back previous setter names. Created 5 years, 8 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/layout/LayoutFullScreen.cpp ('k') | Source/core/layout/LayoutMenuList.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutGrid.cpp
diff --git a/Source/core/layout/LayoutGrid.cpp b/Source/core/layout/LayoutGrid.cpp
index ee85a2d9822950e8311654e80015022d09fcffe7..cc4ff5300ae590d62141d7ccf192ed61ad5952f1 100644
--- a/Source/core/layout/LayoutGrid.cpp
+++ b/Source/core/layout/LayoutGrid.cpp
@@ -1731,7 +1731,7 @@ static bool contentDistributionOffset(LayoutUnit availableFreeSpace, ContentPosi
void LayoutGrid::computeContentPositionAndDistributionColumnOffset(LayoutUnit availableFreeSpace, GridSizingData& sizingData) const
{
- ContentPosition position = styleRef().justifyContent();
+ ContentPosition position = styleRef().justifyContentPosition();
ContentDistributionType distribution = styleRef().justifyContentDistribution();
// If <content-distribution> value can't be applied, 'position' will become the associated
// <content-position> fallback value.
@@ -1777,7 +1777,7 @@ void LayoutGrid::computeContentPositionAndDistributionColumnOffset(LayoutUnit av
void LayoutGrid::computeContentPositionAndDistributionRowOffset(LayoutUnit availableFreeSpace, GridSizingData& sizingData) const
{
- ContentPosition position = styleRef().alignContent();
+ ContentPosition position = styleRef().alignContentPosition();
ContentDistributionType distribution = styleRef().alignContentDistribution();
// If <content-distribution> value can't be applied, 'position' will become the associated
// <content-position> fallback value.
« no previous file with comments | « Source/core/layout/LayoutFullScreen.cpp ('k') | Source/core/layout/LayoutMenuList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698