webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 229 insertions, 234 deletions

diff --git a/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp b/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
index d2bd56f70..3b4888857 100644
--- a/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
+++ b/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2004-2017 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -30,154 +30,181 @@
 #include "StyleTransformData.h"
 #include "StyleImage.h"
 #include "StyleResolver.h"
+#include "StyleScrollSnapPoints.h"
+#include <wtf/PointerComparison.h>
+#include <wtf/RefPtr.h>
 
 namespace WebCore {
 
 StyleRareNonInheritedData::StyleRareNonInheritedData()
     : opacity(RenderStyle::initialOpacity())
-    , m_aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator())
-    , m_aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator())
-    , m_perspective(RenderStyle::initialPerspective())
-    , m_perspectiveOriginX(RenderStyle::initialPerspectiveOriginX())
-    , m_perspectiveOriginY(RenderStyle::initialPerspectiveOriginY())
+    , aspectRatioDenominator(RenderStyle::initialAspectRatioDenominator())
+    , aspectRatioNumerator(RenderStyle::initialAspectRatioNumerator())
+    , perspective(RenderStyle::initialPerspective())
+    , perspectiveOriginX(RenderStyle::initialPerspectiveOriginX())
+    , perspectiveOriginY(RenderStyle::initialPerspectiveOriginY())
     , lineClamp(RenderStyle::initialLineClamp())
-    , m_deprecatedFlexibleBox(StyleDeprecatedFlexibleBoxData::create())
-    , m_flexibleBox(StyleFlexibleBoxData::create())
-    , m_marquee(StyleMarqueeData::create())
-    , m_multiCol(StyleMultiColData::create())
-    , m_transform(StyleTransformData::create())
-#if ENABLE(CSS_FILTERS)
-    , m_filter(StyleFilterData::create())
+    , initialLetter(RenderStyle::initialInitialLetter())
+    , deprecatedFlexibleBox(StyleDeprecatedFlexibleBoxData::create())
+    , flexibleBox(StyleFlexibleBoxData::create())
+    , marquee(StyleMarqueeData::create())
+    , multiCol(StyleMultiColData::create())
+    , transform(StyleTransformData::create())
+    , filter(StyleFilterData::create())
+#if ENABLE(FILTERS_LEVEL_2)
+    , backdropFilter(StyleFilterData::create())
 #endif
-    , m_grid(StyleGridData::create())
-    , m_gridItem(StyleGridItemData::create())
-    , m_mask(FillLayer(MaskFillLayer))
-    , m_pageSize()
-#if ENABLE(CSS_SHAPES)
-    , m_shapeInside(RenderStyle::initialShapeInside())
-    , m_shapeOutside(RenderStyle::initialShapeOutside())
-    , m_shapeMargin(RenderStyle::initialShapeMargin())
-    , m_shapePadding(RenderStyle::initialShapePadding())
-    , m_shapeImageThreshold(RenderStyle::initialShapeImageThreshold())
+    , grid(StyleGridData::create())
+    , gridItem(StyleGridItemData::create())
+#if ENABLE(CSS_SCROLL_SNAP)
+    , scrollSnapPort(StyleScrollSnapPort::create())
+    , scrollSnapArea(StyleScrollSnapArea::create())
 #endif
-    , m_clipPath(RenderStyle::initialClipPath())
-    , m_visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor())
-    , m_order(RenderStyle::initialOrder())
-    , m_flowThread(RenderStyle::initialFlowThread())
-    , m_regionThread(RenderStyle::initialRegionThread())
-    , m_regionFragment(RenderStyle::initialRegionFragment())
-    , m_regionBreakAfter(RenderStyle::initialPageBreak())
-    , m_regionBreakBefore(RenderStyle::initialPageBreak())
-    , m_regionBreakInside(RenderStyle::initialPageBreak())
-    , m_pageSizeType(PAGE_SIZE_AUTO)
-    , m_transformStyle3D(RenderStyle::initialTransformStyle3D())
-    , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility())
-    , m_alignContent(RenderStyle::initialAlignContent())
-    , m_alignItems(RenderStyle::initialAlignItems())
-    , m_alignSelf(RenderStyle::initialAlignSelf())
-    , m_justifyContent(RenderStyle::initialJustifyContent())
+    , willChange(RenderStyle::initialWillChange())
+    , mask(FillLayer(MaskFillLayer))
+    , objectPosition(RenderStyle::initialObjectPosition())
+    , shapeOutside(RenderStyle::initialShapeOutside())
+    , shapeMargin(RenderStyle::initialShapeMargin())
+    , shapeImageThreshold(RenderStyle::initialShapeImageThreshold())
+    , clipPath(RenderStyle::initialClipPath())
+    , visitedLinkBackgroundColor(RenderStyle::initialBackgroundColor())
+    , order(RenderStyle::initialOrder())
+    , flowThread(RenderStyle::initialFlowThread())
+    , regionThread(RenderStyle::initialRegionThread())
+    , alignContent(RenderStyle::initialContentAlignment())
+    , alignItems(RenderStyle::initialDefaultAlignment())
+    , alignSelf(RenderStyle::initialSelfAlignment())
+    , justifyContent(RenderStyle::initialContentAlignment())
+    , justifyItems(RenderStyle::initialSelfAlignment())
+    , justifySelf(RenderStyle::initialSelfAlignment())
+#if ENABLE(TOUCH_EVENTS)
+    , touchAction(static_cast<unsigned>(RenderStyle::initialTouchAction()))
+#endif
+    , regionFragment(RenderStyle::initialRegionFragment())
+    , pageSizeType(PAGE_SIZE_AUTO)
+    , transformStyle3D(RenderStyle::initialTransformStyle3D())
+    , backfaceVisibility(RenderStyle::initialBackfaceVisibility())
     , userDrag(RenderStyle::initialUserDrag())
     , textOverflow(RenderStyle::initialTextOverflow())
     , marginBeforeCollapse(MCOLLAPSE)
     , marginAfterCollapse(MCOLLAPSE)
-    , m_appearance(RenderStyle::initialAppearance())
-    , m_borderFit(RenderStyle::initialBorderFit())
-    , m_textCombine(RenderStyle::initialTextCombine())
-    , m_textDecorationStyle(RenderStyle::initialTextDecorationStyle())
-    , m_wrapFlow(RenderStyle::initialWrapFlow())
-    , m_wrapThrough(RenderStyle::initialWrapThrough())
-#if USE(ACCELERATED_COMPOSITING)
-    , m_runningAcceleratedAnimation(false)
-#endif
-    , m_hasAspectRatio(false)
+    , appearance(RenderStyle::initialAppearance())
+    , borderFit(RenderStyle::initialBorderFit())
+    , textCombine(RenderStyle::initialTextCombine())
+    , textDecorationStyle(RenderStyle::initialTextDecorationStyle())
+    , aspectRatioType(RenderStyle::initialAspectRatioType())
 #if ENABLE(CSS_COMPOSITING)
-    , m_effectiveBlendMode(RenderStyle::initialBlendMode())
+    , effectiveBlendMode(RenderStyle::initialBlendMode())
+    , isolation(RenderStyle::initialIsolation())
 #endif
-    , m_objectFit(RenderStyle::initialObjectFit())
+#if ENABLE(APPLE_PAY)
+    , applePayButtonStyle(static_cast<unsigned>(RenderStyle::initialApplePayButtonStyle()))
+    , applePayButtonType(static_cast<unsigned>(RenderStyle::initialApplePayButtonType()))
+#endif
+    , objectFit(RenderStyle::initialObjectFit())
+    , breakBefore(RenderStyle::initialBreakBetween())
+    , breakAfter(RenderStyle::initialBreakBetween())
+    , breakInside(RenderStyle::initialBreakInside())
+    , resize(RenderStyle::initialResize())
+    , hasAttrContent(false)
+    , isPlaceholderStyle(false)
 {
-    m_maskBoxImage.setMaskDefaults();
+    maskBoxImage.setMaskDefaults();
 }
 
 inline StyleRareNonInheritedData::StyleRareNonInheritedData(const StyleRareNonInheritedData& o)
     : RefCounted<StyleRareNonInheritedData>()
     , opacity(o.opacity)
-    , m_aspectRatioDenominator(o.m_aspectRatioDenominator)
-    , m_aspectRatioNumerator(o.m_aspectRatioNumerator)
-    , m_perspective(o.m_perspective)
-    , m_perspectiveOriginX(o.m_perspectiveOriginX)
-    , m_perspectiveOriginY(o.m_perspectiveOriginY)
+    , aspectRatioDenominator(o.aspectRatioDenominator)
+    , aspectRatioNumerator(o.aspectRatioNumerator)
+    , perspective(o.perspective)
+    , perspectiveOriginX(o.perspectiveOriginX)
+    , perspectiveOriginY(o.perspectiveOriginY)
     , lineClamp(o.lineClamp)
-    , m_deprecatedFlexibleBox(o.m_deprecatedFlexibleBox)
-    , m_flexibleBox(o.m_flexibleBox)
-    , m_marquee(o.m_marquee)
-    , m_multiCol(o.m_multiCol)
-    , m_transform(o.m_transform)
-#if ENABLE(CSS_FILTERS)
-    , m_filter(o.m_filter)
+    , initialLetter(o.initialLetter)
+    , deprecatedFlexibleBox(o.deprecatedFlexibleBox)
+    , flexibleBox(o.flexibleBox)
+    , marquee(o.marquee)
+    , multiCol(o.multiCol)
+    , transform(o.transform)
+    , filter(o.filter)
+#if ENABLE(FILTERS_LEVEL_2)
+    , backdropFilter(o.backdropFilter)
+#endif
+    , grid(o.grid)
+    , gridItem(o.gridItem)
+#if ENABLE(CSS_SCROLL_SNAP)
+    , scrollSnapPort(o.scrollSnapPort)
+    , scrollSnapArea(o.scrollSnapArea)
 #endif
-    , m_grid(o.m_grid)
-    , m_gridItem(o.m_gridItem)
-    , m_content(o.m_content ? o.m_content->clone() : nullptr)
-    , m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives) : nullptr)
-    , m_boxShadow(o.m_boxShadow ? adoptPtr(new ShadowData(*o.m_boxShadow)) : nullptr)
-    , m_boxReflect(o.m_boxReflect)
-    , m_animations(o.m_animations ? adoptPtr(new AnimationList(*o.m_animations)) : nullptr)
-    , m_transitions(o.m_transitions ? adoptPtr(new AnimationList(*o.m_transitions)) : nullptr)
-    , m_mask(o.m_mask)
-    , m_maskBoxImage(o.m_maskBoxImage)
-    , m_pageSize(o.m_pageSize)
-#if ENABLE(CSS_SHAPES)
-    , m_shapeInside(o.m_shapeInside)
-    , m_shapeOutside(o.m_shapeOutside)
-    , m_shapeMargin(o.m_shapeMargin)
-    , m_shapePadding(o.m_shapePadding)
-    , m_shapeImageThreshold(o.m_shapeImageThreshold)
+    , content(o.content ? o.content->clone() : nullptr)
+    , counterDirectives(o.counterDirectives ? clone(*o.counterDirectives) : nullptr)
+    , altText(o.altText)
+    , boxShadow(o.boxShadow ? std::make_unique<ShadowData>(*o.boxShadow) : nullptr)
+    , willChange(o.willChange)
+    , boxReflect(o.boxReflect)
+    , animations(o.animations ? std::make_unique<AnimationList>(*o.animations) : nullptr)
+    , transitions(o.transitions ? std::make_unique<AnimationList>(*o.transitions) : nullptr)
+    , mask(o.mask)
+    , maskBoxImage(o.maskBoxImage)
+    , pageSize(o.pageSize)
+    , objectPosition(o.objectPosition)
+    , shapeOutside(o.shapeOutside)
+    , shapeMargin(o.shapeMargin)
+    , shapeImageThreshold(o.shapeImageThreshold)
+    , clipPath(o.clipPath)
+    , textDecorationColor(o.textDecorationColor)
+    , visitedLinkTextDecorationColor(o.visitedLinkTextDecorationColor)
+    , visitedLinkBackgroundColor(o.visitedLinkBackgroundColor)
+    , visitedLinkOutlineColor(o.visitedLinkOutlineColor)
+    , visitedLinkBorderLeftColor(o.visitedLinkBorderLeftColor)
+    , visitedLinkBorderRightColor(o.visitedLinkBorderRightColor)
+    , visitedLinkBorderTopColor(o.visitedLinkBorderTopColor)
+    , visitedLinkBorderBottomColor(o.visitedLinkBorderBottomColor)
+    , order(o.order)
+    , flowThread(o.flowThread)
+    , regionThread(o.regionThread)
+    , alignContent(o.alignContent)
+    , alignItems(o.alignItems)
+    , alignSelf(o.alignSelf)
+    , justifyContent(o.justifyContent)
+    , justifyItems(o.justifyItems)
+    , justifySelf(o.justifySelf)
+#if ENABLE(TOUCH_EVENTS)
+    , touchAction(o.touchAction)
 #endif
-    , m_clipPath(o.m_clipPath)
-    , m_textDecorationColor(o.m_textDecorationColor)
-    , m_visitedLinkTextDecorationColor(o.m_visitedLinkTextDecorationColor)
-    , m_visitedLinkBackgroundColor(o.m_visitedLinkBackgroundColor)
-    , m_visitedLinkOutlineColor(o.m_visitedLinkOutlineColor)
-    , m_visitedLinkBorderLeftColor(o.m_visitedLinkBorderLeftColor)
-    , m_visitedLinkBorderRightColor(o.m_visitedLinkBorderRightColor)
-    , m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor)
-    , m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor)
-    , m_order(o.m_order)
-    , m_flowThread(o.m_flowThread)
-    , m_regionThread(o.m_regionThread)
-    , m_regionFragment(o.m_regionFragment)
-    , m_regionBreakAfter(o.m_regionBreakAfter)
-    , m_regionBreakBefore(o.m_regionBreakBefore)
-    , m_regionBreakInside(o.m_regionBreakInside)
-    , m_pageSizeType(o.m_pageSizeType)
-    , m_transformStyle3D(o.m_transformStyle3D)
-    , m_backfaceVisibility(o.m_backfaceVisibility)
-    , m_alignContent(o.m_alignContent)
-    , m_alignItems(o.m_alignItems)
-    , m_alignSelf(o.m_alignSelf)
-    , m_justifyContent(o.m_justifyContent)
+    , regionFragment(o.regionFragment)
+    , pageSizeType(o.pageSizeType)
+    , transformStyle3D(o.transformStyle3D)
+    , backfaceVisibility(o.backfaceVisibility)
     , userDrag(o.userDrag)
     , textOverflow(o.textOverflow)
     , marginBeforeCollapse(o.marginBeforeCollapse)
     , marginAfterCollapse(o.marginAfterCollapse)
-    , m_appearance(o.m_appearance)
-    , m_borderFit(o.m_borderFit)
-    , m_textCombine(o.m_textCombine)
-    , m_textDecorationStyle(o.m_textDecorationStyle)
-    , m_wrapFlow(o.m_wrapFlow)
-    , m_wrapThrough(o.m_wrapThrough)
-#if USE(ACCELERATED_COMPOSITING)
-    , m_runningAcceleratedAnimation(o.m_runningAcceleratedAnimation)
-#endif
-    , m_hasAspectRatio(o.m_hasAspectRatio)
+    , appearance(o.appearance)
+    , borderFit(o.borderFit)
+    , textCombine(o.textCombine)
+    , textDecorationStyle(o.textDecorationStyle)
+    , aspectRatioType(o.aspectRatioType)
 #if ENABLE(CSS_COMPOSITING)
-    , m_effectiveBlendMode(o.m_effectiveBlendMode)
+    , effectiveBlendMode(o.effectiveBlendMode)
+    , isolation(o.isolation)
+#endif
+#if ENABLE(APPLE_PAY)
+    , applePayButtonStyle(o.applePayButtonStyle)
+    , applePayButtonType(o.applePayButtonType)
 #endif
-    , m_objectFit(o.m_objectFit)
+    , objectFit(o.objectFit)
+    , breakBefore(o.breakBefore)
+    , breakAfter(o.breakAfter)
+    , breakInside(o.breakInside)
+    , resize(o.resize)
+    , hasAttrContent(o.hasAttrContent)
+    , isPlaceholderStyle(o.isPlaceholderStyle)
 {
 }
 
-PassRef<StyleRareNonInheritedData> StyleRareNonInheritedData::copy() const
+Ref<StyleRareNonInheritedData> StyleRareNonInheritedData::copy() const
 {
     return adoptRef(*new StyleRareNonInheritedData(*this));
 }
@@ -189,152 +216,120 @@ StyleRareNonInheritedData::~StyleRareNonInheritedData()
 bool StyleRareNonInheritedData::operator==(const StyleRareNonInheritedData& o) const
 {
     return opacity == o.opacity
-        && m_aspectRatioDenominator == o.m_aspectRatioDenominator
-        && m_aspectRatioNumerator == o.m_aspectRatioNumerator
-        && m_perspective == o.m_perspective
-        && m_perspectiveOriginX == o.m_perspectiveOriginX
-        && m_perspectiveOriginY == o.m_perspectiveOriginY
+        && aspectRatioDenominator == o.aspectRatioDenominator
+        && aspectRatioNumerator == o.aspectRatioNumerator
+        && perspective == o.perspective
+        && perspectiveOriginX == o.perspectiveOriginX
+        && perspectiveOriginY == o.perspectiveOriginY
         && lineClamp == o.lineClamp
+        && initialLetter == o.initialLetter
 #if ENABLE(DASHBOARD_SUPPORT)
-        && m_dashboardRegions == o.m_dashboardRegions
+        && dashboardRegions == o.dashboardRegions
 #endif
-        && m_deprecatedFlexibleBox == o.m_deprecatedFlexibleBox
-        && m_flexibleBox == o.m_flexibleBox
-        && m_marquee == o.m_marquee
-        && m_multiCol == o.m_multiCol
-        && m_transform == o.m_transform
-#if ENABLE(CSS_FILTERS)
-        && m_filter == o.m_filter
+        && deprecatedFlexibleBox == o.deprecatedFlexibleBox
+        && flexibleBox == o.flexibleBox
+        && marquee == o.marquee
+        && multiCol == o.multiCol
+        && transform == o.transform
+        && filter == o.filter
+#if ENABLE(FILTERS_LEVEL_2)
+        && backdropFilter == o.backdropFilter
 #endif
-        && m_grid == o.m_grid
-        && m_gridItem == o.m_gridItem
-        && contentDataEquivalent(o)
-        && counterDataEquivalent(o)
-        && shadowDataEquivalent(o)
-        && reflectionDataEquivalent(o)
-        && animationDataEquivalent(o)
-        && transitionDataEquivalent(o)
-        && m_mask == o.m_mask
-        && m_maskBoxImage == o.m_maskBoxImage
-        && m_pageSize == o.m_pageSize
-#if ENABLE(CSS_SHAPES)
-        && m_shapeInside == o.m_shapeInside
-        && m_shapeOutside == o.m_shapeOutside
-        && m_shapeMargin == o.m_shapeMargin
-        && m_shapePadding == o.m_shapePadding
-        && m_shapeImageThreshold == o.m_shapeImageThreshold
+        && grid == o.grid
+        && gridItem == o.gridItem
+#if ENABLE(CSS_SCROLL_SNAP)
+        && scrollSnapPort == o.scrollSnapPort
+        && scrollSnapArea == o.scrollSnapArea
 #endif
-        && m_clipPath == o.m_clipPath
-        && m_textDecorationColor == o.m_textDecorationColor
-        && m_visitedLinkTextDecorationColor == o.m_visitedLinkTextDecorationColor
-        && m_visitedLinkBackgroundColor == o.m_visitedLinkBackgroundColor
-        && m_visitedLinkOutlineColor == o.m_visitedLinkOutlineColor
-        && m_visitedLinkBorderLeftColor == o.m_visitedLinkBorderLeftColor
-        && m_visitedLinkBorderRightColor == o.m_visitedLinkBorderRightColor
-        && m_visitedLinkBorderTopColor == o.m_visitedLinkBorderTopColor
-        && m_visitedLinkBorderBottomColor == o.m_visitedLinkBorderBottomColor
-        && m_order == o.m_order
-        && m_flowThread == o.m_flowThread
-        && m_regionThread == o.m_regionThread
-        && m_regionFragment == o.m_regionFragment
-        && m_regionBreakAfter == o.m_regionBreakAfter
-        && m_regionBreakBefore == o.m_regionBreakBefore
-        && m_regionBreakInside == o.m_regionBreakInside
-        && m_pageSizeType == o.m_pageSizeType
-        && m_transformStyle3D == o.m_transformStyle3D
-        && m_backfaceVisibility == o.m_backfaceVisibility
-        && m_alignContent == o.m_alignContent
-        && m_alignItems == o.m_alignItems
-        && m_alignSelf == o.m_alignSelf
-        && m_justifyContent == o.m_justifyContent
+        && contentDataEquivalent(o)
+        && arePointingToEqualData(counterDirectives, o.counterDirectives)
+        && altText == o.altText
+        && arePointingToEqualData(boxShadow, o.boxShadow)
+        && arePointingToEqualData(willChange, o.willChange)
+        && arePointingToEqualData(boxReflect, o.boxReflect)
+        && arePointingToEqualData(animations, o.animations)
+        && arePointingToEqualData(transitions, o.transitions)
+        && mask == o.mask
+        && maskBoxImage == o.maskBoxImage
+        && pageSize == o.pageSize
+        && objectPosition == o.objectPosition
+        && arePointingToEqualData(shapeOutside, o.shapeOutside)
+        && shapeMargin == o.shapeMargin
+        && shapeImageThreshold == o.shapeImageThreshold
+        && arePointingToEqualData(clipPath, o.clipPath)
+        && textDecorationColor == o.textDecorationColor
+        && visitedLinkTextDecorationColor == o.visitedLinkTextDecorationColor
+        && visitedLinkBackgroundColor == o.visitedLinkBackgroundColor
+        && visitedLinkOutlineColor == o.visitedLinkOutlineColor
+        && visitedLinkBorderLeftColor == o.visitedLinkBorderLeftColor
+        && visitedLinkBorderRightColor == o.visitedLinkBorderRightColor
+        && visitedLinkBorderTopColor == o.visitedLinkBorderTopColor
+        && visitedLinkBorderBottomColor == o.visitedLinkBorderBottomColor
+        && order == o.order
+        && flowThread == o.flowThread
+        && alignContent == o.alignContent
+        && alignItems == o.alignItems
+        && alignSelf == o.alignSelf
+        && justifyContent == o.justifyContent
+        && justifyItems == o.justifyItems
+        && justifySelf == o.justifySelf
+        && regionThread == o.regionThread
+        && regionFragment == o.regionFragment
+        && pageSizeType == o.pageSizeType
+        && transformStyle3D == o.transformStyle3D
+        && backfaceVisibility == o.backfaceVisibility
         && userDrag == o.userDrag
         && textOverflow == o.textOverflow
         && marginBeforeCollapse == o.marginBeforeCollapse
         && marginAfterCollapse == o.marginAfterCollapse
-        && m_appearance == o.m_appearance
-        && m_borderFit == o.m_borderFit
-        && m_textCombine == o.m_textCombine
-        && m_textDecorationStyle == o.m_textDecorationStyle
-        && m_wrapFlow == o.m_wrapFlow
-        && m_wrapThrough == o.m_wrapThrough
-#if USE(ACCELERATED_COMPOSITING)
-        && !m_runningAcceleratedAnimation && !o.m_runningAcceleratedAnimation
+        && appearance == o.appearance
+        && borderFit == o.borderFit
+        && textCombine == o.textCombine
+        && textDecorationStyle == o.textDecorationStyle
+#if ENABLE(TOUCH_EVENTS)
+        && touchAction == o.touchAction
 #endif
 #if ENABLE(CSS_COMPOSITING)
-        && m_effectiveBlendMode == o.m_effectiveBlendMode
+        && effectiveBlendMode == o.effectiveBlendMode
+        && isolation == o.isolation
+#endif
+#if ENABLE(APPLE_PAY)
+        && applePayButtonStyle == o.applePayButtonStyle
+        && applePayButtonType == o.applePayButtonType
 #endif
-        && m_hasAspectRatio == o.m_hasAspectRatio
-        && m_objectFit == o.m_objectFit;
+        && aspectRatioType == o.aspectRatioType
+        && objectFit == o.objectFit
+        && breakAfter == o.breakAfter
+        && breakBefore == o.breakBefore
+        && breakInside == o.breakInside
+        && resize == o.resize
+        && hasAttrContent == o.hasAttrContent
+        && isPlaceholderStyle == o.isPlaceholderStyle;
 }
 
-bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInheritedData& o) const
+bool StyleRareNonInheritedData::contentDataEquivalent(const StyleRareNonInheritedData& other) const
 {
-    ContentData* a = m_content.get();
-    ContentData* b = o.m_content.get();
-
+    auto* a = content.get();
+    auto* b = other.content.get();
     while (a && b && *a == *b) {
         a = a->next();
         b = b->next();
     }
-
     return !a && !b;
 }
 
-bool StyleRareNonInheritedData::counterDataEquivalent(const StyleRareNonInheritedData& o) const
-{
-    if (m_counterDirectives.get() == o.m_counterDirectives.get())
-        return true;
-        
-    if (m_counterDirectives && o.m_counterDirectives && *m_counterDirectives == *o.m_counterDirectives)
-        return true;
-
-    return false;
-}
-
-bool StyleRareNonInheritedData::shadowDataEquivalent(const StyleRareNonInheritedData& o) const
-{
-    if ((!m_boxShadow && o.m_boxShadow) || (m_boxShadow && !o.m_boxShadow))
-        return false;
-    if (m_boxShadow && o.m_boxShadow && (*m_boxShadow != *o.m_boxShadow))
-        return false;
-    return true;
-}
-
-bool StyleRareNonInheritedData::reflectionDataEquivalent(const StyleRareNonInheritedData& o) const
+bool StyleRareNonInheritedData::hasFilters() const
 {
-    if (m_boxReflect != o.m_boxReflect) {
-        if (!m_boxReflect || !o.m_boxReflect)
-            return false;
-        return *m_boxReflect == *o.m_boxReflect;
-    }
-    return true;
+    return !filter->operations.isEmpty();
 }
 
-bool StyleRareNonInheritedData::animationDataEquivalent(const StyleRareNonInheritedData& o) const
-{
-    if ((!m_animations && o.m_animations) || (m_animations && !o.m_animations))
-        return false;
-    if (m_animations && o.m_animations && (*m_animations != *o.m_animations))
-        return false;
-    return true;
-}
+#if ENABLE(FILTERS_LEVEL_2)
 
-bool StyleRareNonInheritedData::transitionDataEquivalent(const StyleRareNonInheritedData& o) const
+bool StyleRareNonInheritedData::hasBackdropFilters() const
 {
-    if ((!m_transitions && o.m_transitions) || (m_transitions && !o.m_transitions))
-        return false;
-    if (m_transitions && o.m_transitions && (*m_transitions != *o.m_transitions))
-        return false;
-    return true;
+    return !backdropFilter->operations.isEmpty();
 }
 
-bool StyleRareNonInheritedData::hasFilters() const
-{
-#if ENABLE(CSS_FILTERS)
-    return m_filter.get() && !m_filter->m_operations.isEmpty();
-#else
-    return false;
 #endif
-}
 
 } // namespace WebCore