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

Unified Diff: Source/core/rendering/style/StyleRareNonInheritedData.cpp

Issue 17090005: [CSS Grid Layout] Implement 'justify-self' parsing (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed a bug in parseColor uncovered by the patch Created 6 years, 11 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/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/style/StyleRareNonInheritedData.cpp
diff --git a/Source/core/rendering/style/StyleRareNonInheritedData.cpp b/Source/core/rendering/style/StyleRareNonInheritedData.cpp
index 2d312788ec6713ab8d9b0bbd8867c7fc709e4f88..b393b4ede56664eb6bb558f46cde1f1fa44e5ab7 100644
--- a/Source/core/rendering/style/StyleRareNonInheritedData.cpp
+++ b/Source/core/rendering/style/StyleRareNonInheritedData.cpp
@@ -80,6 +80,8 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()
, m_touchAction(RenderStyle::initialTouchAction())
, m_objectFit(RenderStyle::initialObjectFit())
, m_isolation(RenderStyle::initialIsolation())
+ , m_justifySelf(RenderStyle::initialJustifySelf())
+ , m_justifySelfOverflowAlignment(RenderStyle::initialJustifySelfOverflowAlignment())
{
m_maskBoxImage.setMaskDefaults();
}
@@ -156,6 +158,8 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
, m_touchAction(o.m_touchAction)
, m_objectFit(o.m_objectFit)
, m_isolation(o.m_isolation)
+ , m_justifySelf(o.m_justifySelf)
+ , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment)
{
}
@@ -238,7 +242,9 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
&& m_hasAspectRatio == o.m_hasAspectRatio
&& m_touchAction == o.m_touchAction
&& m_objectFit == o.m_objectFit
- && m_isolation == o.m_isolation;
+ && m_isolation == o.m_isolation
+ && m_justifySelf == o.m_justifySelf
+ && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment;
}
bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInheritedData& o) const
« no previous file with comments | « Source/core/rendering/style/StyleRareNonInheritedData.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698