Index: third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp |
diff --git a/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp b/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp |
index 2a35e71987e5d05c8606865d366784904d692158..cefcfd2bcc6d154f73f8e071fda8654190c9c42e 100644 |
--- a/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp |
+++ b/third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp |
@@ -36,14 +36,14 @@ namespace blink { |
class SameSizeStyleRareNonInheritedData |
: public RefCounted<StyleRareNonInheritedData> { |
public: |
- float floats[3]; |
+ float floats[2]; |
int integers; |
- LengthPoint lengthPoints[2]; |
+ LengthPoint lengthPoints[1]; |
LineClampValue lineClamps; |
DraggableRegionMode draggableRegions; |
- void* dataRefs[8]; |
+ void* dataRefs[7]; |
DataPersistent<void*> dataPersistents[2]; |
void* ownPtrs[4]; |
Persistent<void*> persistentHandles[2]; |
@@ -72,10 +72,8 @@ static_assert(sizeof(StyleRareNonInheritedData) == |
StyleRareNonInheritedData::StyleRareNonInheritedData() |
: opacity(ComputedStyle::initialOpacity()), |
- m_perspective(ComputedStyle::initialPerspective()), |
m_shapeImageThreshold(ComputedStyle::initialShapeImageThreshold()), |
m_order(ComputedStyle::initialOrder()), |
- m_perspectiveOrigin(ComputedStyle::initialPerspectiveOrigin()), |
m_objectPosition(ComputedStyle::initialObjectPosition()), |
lineClamp(ComputedStyle::initialLineClamp()), |
m_draggableRegionMode(DraggableRegionNone), |
@@ -100,8 +98,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData() |
m_justifyItems(ComputedStyle::initialSelfAlignment()), |
m_justifySelf(ComputedStyle::initialSelfAlignment()), |
m_pageSizeType(PAGE_SIZE_AUTO), |
- m_transformStyle3D(ComputedStyle::initialTransformStyle3D()), |
- m_backfaceVisibility(ComputedStyle::initialBackfaceVisibility()), |
userDrag(ComputedStyle::initialUserDrag()), |
textOverflow(ComputedStyle::initialTextOverflow()), |
marginBeforeCollapse(MarginCollapseCollapse), |
@@ -116,7 +112,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData() |
m_runningTransformAnimationOnCompositor(false), |
m_runningFilterAnimationOnCompositor(false), |
m_runningBackdropFilterAnimationOnCompositor(false), |
- m_isStackingContext(false), |
m_effectiveBlendMode(ComputedStyle::initialBlendMode()), |
m_touchAction(ComputedStyle::initialTouchAction()), |
m_objectFit(ComputedStyle::initialObjectFit()), |
@@ -125,7 +120,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData() |
m_scrollBehavior(ComputedStyle::initialScrollBehavior()), |
m_scrollSnapType(ComputedStyle::initialScrollSnapType()), |
m_requiresAcceleratedCompositingForExternalReasons(false), |
- m_hasInlineTransform(false), |
m_resize(ComputedStyle::initialResize()), |
m_hasCompositorProxy(false), |
m_hasAuthorBackground(false), |
@@ -137,17 +131,14 @@ StyleRareNonInheritedData::StyleRareNonInheritedData( |
const StyleRareNonInheritedData& o) |
: RefCounted<StyleRareNonInheritedData>(), |
opacity(o.opacity), |
- m_perspective(o.m_perspective), |
m_shapeImageThreshold(o.m_shapeImageThreshold), |
m_order(o.m_order), |
- m_perspectiveOrigin(o.m_perspectiveOrigin), |
m_objectPosition(o.m_objectPosition), |
lineClamp(o.lineClamp), |
m_draggableRegionMode(o.m_draggableRegionMode), |
m_deprecatedFlexibleBox(o.m_deprecatedFlexibleBox), |
m_flexibleBox(o.m_flexibleBox), |
m_multiCol(o.m_multiCol), |
- m_transform(o.m_transform), |
m_willChange(o.m_willChange), |
m_filter(o.m_filter), |
m_backdropFilter(o.m_backdropFilter), |
@@ -187,8 +178,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData( |
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), |
@@ -208,7 +197,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData( |
o.m_runningFilterAnimationOnCompositor), |
m_runningBackdropFilterAnimationOnCompositor( |
o.m_runningBackdropFilterAnimationOnCompositor), |
- m_isStackingContext(o.m_isStackingContext), |
m_effectiveBlendMode(o.m_effectiveBlendMode), |
m_touchAction(o.m_touchAction), |
m_objectFit(o.m_objectFit), |
@@ -218,7 +206,6 @@ StyleRareNonInheritedData::StyleRareNonInheritedData( |
m_scrollSnapType(o.m_scrollSnapType), |
m_requiresAcceleratedCompositingForExternalReasons( |
o.m_requiresAcceleratedCompositingForExternalReasons), |
- m_hasInlineTransform(o.m_hasInlineTransform), |
m_resize(o.m_resize), |
m_hasCompositorProxy(o.m_hasCompositorProxy), |
m_hasAuthorBackground(o.m_hasAuthorBackground), |
@@ -228,23 +215,23 @@ StyleRareNonInheritedData::~StyleRareNonInheritedData() {} |
bool StyleRareNonInheritedData::operator==( |
const StyleRareNonInheritedData& o) const { |
- return opacity == o.opacity && m_perspective == o.m_perspective && |
+ return opacity == o.opacity && |
m_shapeImageThreshold == o.m_shapeImageThreshold && |
- m_order == o.m_order && m_perspectiveOrigin == o.m_perspectiveOrigin && |
- m_objectPosition == o.m_objectPosition && lineClamp == o.lineClamp && |
+ m_order == o.m_order && m_objectPosition == o.m_objectPosition && |
+ lineClamp == o.lineClamp && |
m_draggableRegionMode == o.m_draggableRegionMode && |
m_deprecatedFlexibleBox == o.m_deprecatedFlexibleBox && |
m_flexibleBox == o.m_flexibleBox && m_multiCol == o.m_multiCol && |
- m_transform == o.m_transform && m_willChange == o.m_willChange && |
- m_filter == o.m_filter && m_backdropFilter == o.m_backdropFilter && |
- m_grid == o.m_grid && m_gridItem == o.m_gridItem && |
- m_scrollSnap == o.m_scrollSnap && contentDataEquivalent(o) && |
- counterDataEquivalent(o) && shadowDataEquivalent(o) && |
- reflectionDataEquivalent(o) && animationDataEquivalent(o) && |
- transitionDataEquivalent(o) && shapeOutsideDataEquivalent(o) && |
- m_mask == o.m_mask && m_maskBoxImage == o.m_maskBoxImage && |
- m_pageSize == o.m_pageSize && m_shapeMargin == o.m_shapeMargin && |
- m_outline == o.m_outline && clipPathDataEquivalent(o) && |
+ m_willChange == o.m_willChange && m_filter == o.m_filter && |
+ m_backdropFilter == o.m_backdropFilter && m_grid == o.m_grid && |
+ m_gridItem == o.m_gridItem && m_scrollSnap == o.m_scrollSnap && |
+ contentDataEquivalent(o) && counterDataEquivalent(o) && |
+ shadowDataEquivalent(o) && reflectionDataEquivalent(o) && |
+ animationDataEquivalent(o) && transitionDataEquivalent(o) && |
+ shapeOutsideDataEquivalent(o) && m_mask == o.m_mask && |
+ m_maskBoxImage == o.m_maskBoxImage && m_pageSize == o.m_pageSize && |
+ m_shapeMargin == o.m_shapeMargin && m_outline == o.m_outline && |
+ clipPathDataEquivalent(o) && |
m_textDecorationColor == o.m_textDecorationColor && |
m_visitedLinkTextDecorationColor == |
o.m_visitedLinkTextDecorationColor && |
@@ -261,10 +248,8 @@ bool StyleRareNonInheritedData::operator==( |
m_justifyContent == o.m_justifyContent && |
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 && |
+ m_pageSizeType == o.m_pageSizeType && userDrag == o.userDrag && |
+ textOverflow == o.textOverflow && |
marginBeforeCollapse == o.marginBeforeCollapse && |
marginAfterCollapse == o.marginAfterCollapse && |
m_appearance == o.m_appearance && |
@@ -274,7 +259,6 @@ bool StyleRareNonInheritedData::operator==( |
m_hasCurrentFilterAnimation == o.m_hasCurrentFilterAnimation && |
m_hasCurrentBackdropFilterAnimation == |
o.m_hasCurrentBackdropFilterAnimation && |
- m_isStackingContext == o.m_isStackingContext && |
m_effectiveBlendMode == o.m_effectiveBlendMode && |
m_touchAction == o.m_touchAction && m_objectFit == o.m_objectFit && |
m_isolation == o.m_isolation && m_contain == o.m_contain && |
@@ -282,7 +266,6 @@ bool StyleRareNonInheritedData::operator==( |
m_scrollSnapType == o.m_scrollSnapType && |
m_requiresAcceleratedCompositingForExternalReasons == |
o.m_requiresAcceleratedCompositingForExternalReasons && |
- m_hasInlineTransform == o.m_hasInlineTransform && |
m_resize == o.m_resize && |
m_hasCompositorProxy == o.m_hasCompositorProxy && |
m_hasAuthorBackground == o.m_hasAuthorBackground && |