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

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

Issue 1070143002: [Alignment] Single class for holding the alignment data. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Using the StyleConverter. 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
Index: Source/core/style/StyleRareNonInheritedData.cpp
diff --git a/Source/core/style/StyleRareNonInheritedData.cpp b/Source/core/style/StyleRareNonInheritedData.cpp
index d8b5d8eff707c956630ff35468130f48ee5b5899..c76e12b48ef908370141fc173c51cfce823d36a2 100644
--- a/Source/core/style/StyleRareNonInheritedData.cpp
+++ b/Source/core/style/StyleRareNonInheritedData.cpp
@@ -54,19 +54,15 @@ StyleRareNonInheritedData::StyleRareNonInheritedData()
, m_visitedLinkBorderBottomColor(StyleColor::currentColor())
, m_order(ComputedStyle::initialOrder())
, m_objectPosition(ComputedStyle::initialObjectPosition())
- , 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_justifyItems(ComputedStyle::initialJustifyItems())
+ , m_justifySelf(ComputedStyle::initialJustifySelf())
+ , m_pageSizeType(PAGE_SIZE_AUTO)
+ , m_transformStyle3D(ComputedStyle::initialTransformStyle3D())
+ , m_backfaceVisibility(ComputedStyle::initialBackfaceVisibility())
, userDrag(ComputedStyle::initialUserDrag())
, textOverflow(ComputedStyle::initialTextOverflow())
, marginBeforeCollapse(MCOLLAPSE)
@@ -86,11 +82,6 @@ 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_scrollBehavior(ComputedStyle::initialScrollBehavior())
, m_scrollBlocksOn(ComputedStyle::initialScrollBlocksOn())
, m_requiresAcceleratedCompositingForExternalReasons(false)
@@ -139,19 +130,15 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
, m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor)
, m_order(o.m_order)
, m_objectPosition(o.m_objectPosition)
- , m_pageSizeType(o.m_pageSizeType)
- , 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)
+ , m_justifyItems(o.m_justifyItems)
+ , m_justifySelf(o.m_justifySelf)
+ , m_pageSizeType(o.m_pageSizeType)
+ , m_transformStyle3D(o.m_transformStyle3D)
+ , m_backfaceVisibility(o.m_backfaceVisibility)
, userDrag(o.userDrag)
, textOverflow(o.textOverflow)
, marginBeforeCollapse(o.marginBeforeCollapse)
@@ -171,11 +158,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInherited
, m_touchAction(o.m_touchAction)
, 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)
@@ -231,19 +213,15 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
&& m_order == o.m_order
&& m_objectPosition == o.m_objectPosition
&& m_callbackSelectors == o.m_callbackSelectors
- && m_pageSizeType == o.m_pageSizeType
- && 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
+ && m_justifyItems == o.m_justifyItems
+ && m_justifySelf == o.m_justifySelf
+ && m_pageSizeType == o.m_pageSizeType
+ && m_transformStyle3D == o.m_transformStyle3D
+ && m_backfaceVisibility == o.m_backfaceVisibility
&& userDrag == o.userDrag
&& textOverflow == o.textOverflow
&& marginBeforeCollapse == o.marginBeforeCollapse
@@ -260,11 +238,6 @@ bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) c
&& m_touchAction == o.m_touchAction
&& 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

Powered by Google App Engine
This is Rietveld 408576698