Index: Source/core/style/StyleRareNonInheritedData.cpp |
diff --git a/Source/core/style/StyleRareNonInheritedData.cpp b/Source/core/style/StyleRareNonInheritedData.cpp |
index 8c7c96b24cb413bccf5ed2b3646e8b27da430543..d74e979c7251729fb8f8c0cd58ec822aaa78f09d 100644 |
--- a/Source/core/style/StyleRareNonInheritedData.cpp |
+++ b/Source/core/style/StyleRareNonInheritedData.cpp |
@@ -57,16 +57,10 @@ StyleRareNonInheritedData::StyleRareNonInheritedData() |
, m_pageSizeType(PAGE_SIZE_AUTO) |
, m_transformStyle3D(ComputedStyle::initialTransformStyle3D()) |
, m_backfaceVisibility(ComputedStyle::initialBackfaceVisibility()) |
- , m_alignContent(ComputedStyle::initialAlignContent()) |
- , m_alignContentDistribution(ComputedStyle::initialAlignContentDistribution()) |
- , m_alignContentOverflowAlignment(ComputedStyle::initialAlignContentOverflowAlignment()) |
- , m_alignItems(ComputedStyle::initialAlignItems()) |
- , m_alignItemsOverflowAlignment(ComputedStyle::initialAlignItemsOverflowAlignment()) |
- , m_alignSelf(ComputedStyle::initialAlignSelf()) |
- , m_alignSelfOverflowAlignment(ComputedStyle::initialAlignSelfOverflowAlignment()) |
- , m_justifyContent(ComputedStyle::initialJustifyContent()) |
- , m_justifyContentDistribution(ComputedStyle::initialJustifyContentDistribution()) |
- , m_justifyContentOverflowAlignment(ComputedStyle::initialJustifyContentOverflowAlignment()) |
+ , m_alignContent(ComputedStyle::initialAlignContent(), ComputedStyle::initialAlignContentDistribution(), ComputedStyle::initialAlignContentOverflowAlignment()) |
+ , m_alignItems(ComputedStyle::initialAlignItems(), ComputedStyle::initialAlignItemsOverflowAlignment()) |
+ , m_alignSelf(ComputedStyle::initialAlignSelf(), ComputedStyle::initialAlignSelfOverflowAlignment()) |
+ , m_justifyContent(ComputedStyle::initialJustifyContent(), ComputedStyle::initialJustifyContentDistribution(), ComputedStyle::initialJustifyContentOverflowAlignment()) |
, userDrag(ComputedStyle::initialUserDrag()) |
, textOverflow(ComputedStyle::initialTextOverflow()) |
, marginBeforeCollapse(MCOLLAPSE) |
@@ -86,11 +80,8 @@ StyleRareNonInheritedData::StyleRareNonInheritedData() |
, m_touchAction(ComputedStyle::initialTouchAction()) |
, m_objectFit(ComputedStyle::initialObjectFit()) |
, m_isolation(ComputedStyle::initialIsolation()) |
- , m_justifyItems(ComputedStyle::initialJustifyItems()) |
- , m_justifyItemsOverflowAlignment(ComputedStyle::initialJustifyItemsOverflowAlignment()) |
- , m_justifyItemsPositionType(ComputedStyle::initialJustifyItemsPositionType()) |
- , m_justifySelf(ComputedStyle::initialJustifySelf()) |
- , m_justifySelfOverflowAlignment(ComputedStyle::initialJustifySelfOverflowAlignment()) |
+ , m_justifyItems(ComputedStyle::initialJustifyItems(), ComputedStyle::initialJustifyItemsOverflowAlignment(), ComputedStyle::initialJustifyItemsPositionType()) |
+ , m_justifySelf(ComputedStyle::initialJustifySelf(), ComputedStyle::initialJustifySelfOverflowAlignment()) |
, m_scrollBehavior(ComputedStyle::initialScrollBehavior()) |
, m_scrollBlocksOn(ComputedStyle::initialScrollBlocksOn()) |
, m_requiresAcceleratedCompositingForExternalReasons(false) |
@@ -142,15 +133,9 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited |
, m_transformStyle3D(o.m_transformStyle3D) |
, m_backfaceVisibility(o.m_backfaceVisibility) |
, m_alignContent(o.m_alignContent) |
- , m_alignContentDistribution(o.m_alignContentDistribution) |
- , m_alignContentOverflowAlignment(o.m_alignContentOverflowAlignment) |
, m_alignItems(o.m_alignItems) |
- , m_alignItemsOverflowAlignment(o.m_alignItemsOverflowAlignment) |
, m_alignSelf(o.m_alignSelf) |
- , m_alignSelfOverflowAlignment(o.m_alignSelfOverflowAlignment) |
, m_justifyContent(o.m_justifyContent) |
- , m_justifyContentDistribution(o.m_justifyContentDistribution) |
- , m_justifyContentOverflowAlignment(o.m_justifyContentOverflowAlignment) |
, userDrag(o.userDrag) |
, textOverflow(o.textOverflow) |
, marginBeforeCollapse(o.marginBeforeCollapse) |
@@ -171,10 +156,7 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited |
, m_objectFit(o.m_objectFit) |
, m_isolation(o.m_isolation) |
, m_justifyItems(o.m_justifyItems) |
- , m_justifyItemsOverflowAlignment(o.m_justifyItemsOverflowAlignment) |
- , m_justifyItemsPositionType(o.m_justifyItemsPositionType) |
, m_justifySelf(o.m_justifySelf) |
- , m_justifySelfOverflowAlignment(o.m_justifySelfOverflowAlignment) |
, m_scrollBehavior(o.m_scrollBehavior) |
, m_scrollBlocksOn(o.m_scrollBlocksOn) |
, m_requiresAcceleratedCompositingForExternalReasons(o.m_requiresAcceleratedCompositingForExternalReasons) |
@@ -233,15 +215,9 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c |
&& m_transformStyle3D == o.m_transformStyle3D |
&& m_backfaceVisibility == o.m_backfaceVisibility |
&& m_alignContent == o.m_alignContent |
- && m_alignContentDistribution == o.m_alignContentDistribution |
- && m_alignContentOverflowAlignment == o.m_alignContentOverflowAlignment |
&& m_alignItems == o.m_alignItems |
- && m_alignItemsOverflowAlignment == o.m_alignItemsOverflowAlignment |
&& m_alignSelf == o.m_alignSelf |
- && m_alignSelfOverflowAlignment == o.m_alignSelfOverflowAlignment |
&& m_justifyContent == o.m_justifyContent |
- && m_justifyContentDistribution == o.m_justifyContentDistribution |
- && m_justifyContentOverflowAlignment == o.m_justifyContentOverflowAlignment |
&& userDrag == o.userDrag |
&& textOverflow == o.textOverflow |
&& marginBeforeCollapse == o.marginBeforeCollapse |
@@ -259,10 +235,7 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c |
&& m_objectFit == o.m_objectFit |
&& m_isolation == o.m_isolation |
&& m_justifyItems == o.m_justifyItems |
- && m_justifyItemsOverflowAlignment == o.m_justifyItemsOverflowAlignment |
- && m_justifyItemsPositionType == o.m_justifyItemsPositionType |
&& m_justifySelf == o.m_justifySelf |
- && m_justifySelfOverflowAlignment == o.m_justifySelfOverflowAlignment |
&& m_scrollBehavior == o.m_scrollBehavior |
&& m_scrollBlocksOn == o.m_scrollBlocksOn |
&& m_requiresAcceleratedCompositingForExternalReasons == o.m_requiresAcceleratedCompositingForExternalReasons |