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

Unified Diff: Source/core/style/ComputedStyle.h

Issue 1136283006: [CSS Grid Layout] Avoid using StyleAdjuster to resolve 'auto' values. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed some layout tests failures. Created 5 years, 7 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/LayoutGrid.cpp ('k') | Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/style/ComputedStyle.h
diff --git a/Source/core/style/ComputedStyle.h b/Source/core/style/ComputedStyle.h
index 64abb5eb0ef055f4949c15f8119748e51432bb07..d1cb59cf432830a5ffc9aa2b2df072726fb6ca45 100644
--- a/Source/core/style/ComputedStyle.h
+++ b/Source/core/style/ComputedStyle.h
@@ -351,8 +351,14 @@ public:
// Computes how the style change should be propagated down the tree.
static StyleRecalcChange stylePropagationDiff(const ComputedStyle* oldStyle, const ComputedStyle* newStyle);
- static ItemPosition resolveAlignment(const ComputedStyle& parentStyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject);
- static ItemPosition resolveJustification(const ComputedStyle& parentStyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject);
+ ContentPosition resolvedAlignContentPosition() const;
+ ContentDistributionType resolvedAlignContentDistribution() const;
+ ContentPosition resolvedJustifyContentPosition() const;
+ ContentDistributionType resolvedJustifyContentDistribution() const;
+ static ItemPosition resolvedAlignSelfPosition(const ComputedStyle& parentStyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject);
+ static OverflowAlignment resolvedAlignSelfOverflow(const ComputedStyle& parentStyle, const ComputedStyle& childStyle);
+ static ItemPosition resolvedJustifySelfPosition(const ComputedStyle& parentStyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject);
+ static OverflowAlignment resolvedJustifySelfOverflow(const ComputedStyle& parentStyle, const ComputedStyle& childStyle);
StyleDifference visualInvalidationDiff(const ComputedStyle&) const;
« no previous file with comments | « Source/core/layout/LayoutGrid.cpp ('k') | Source/core/style/ComputedStyle.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698