[RFC] Move StyleTransformData to ComputedStyle top-level

third_party/WebKit/Source/core/style/StyleRareNonInheritedData.cpp

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 18 matching lines @@
 #include "core/style/ShadowList.h"
 #include "core/style/StyleFilterData.h"
 #include "core/style/StyleNonInheritedVariables.h"
 #include "core/style/StyleTransformData.h"
 
 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];
   void* refPtrs[3];
   void* uniquePtrs[1];
 
   FillLayer fillLayers;
   NinePieceImage ninePieces;
   FloatSize floatSize;
   Length lengths;
   OutlineValue outline;
 
   StyleColor styleColors[8];
 
   Vector<String> m_callbackSelectors;
 
   StyleContentAlignmentData contentAlignmentData[2];
   StyleSelfAlignmentData selfAlignmentData[4];
 
   unsigned m_bitFields[2];
 };
 
 static_assert(sizeof(StyleRareNonInheritedData) ==
                   sizeof(SameSizeStyleRareNonInheritedData),
               "StyleRareNonInheritedData_should_stay_small");
 
 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),
       m_shapeOutside(ComputedStyle::initialShapeOutside()),
       m_clipPath(ComputedStyle::initialClipPath()),
       m_mask(MaskFillLayer, true),
       m_pageSize(),
       m_shapeMargin(ComputedStyle::initialShapeMargin()),
       m_textDecorationColor(StyleColor::currentColor()),
       m_visitedLinkTextDecorationColor(StyleColor::currentColor()),
       m_visitedLinkBackgroundColor(ComputedStyle::initialBackgroundColor()),
       m_visitedLinkOutlineColor(StyleColor::currentColor()),
       m_visitedLinkBorderLeftColor(StyleColor::currentColor()),
       m_visitedLinkBorderRightColor(StyleColor::currentColor()),
       m_visitedLinkBorderTopColor(StyleColor::currentColor()),
       m_visitedLinkBorderBottomColor(StyleColor::currentColor()),
       m_variables(ComputedStyle::initialNonInheritedVariables()),
       m_alignContent(ComputedStyle::initialContentAlignment()),
       m_alignItems(ComputedStyle::initialDefaultAlignment()),
       m_alignSelf(ComputedStyle::initialSelfAlignment()),
       m_justifyContent(ComputedStyle::initialContentAlignment()),
       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),
       marginAfterCollapse(MarginCollapseCollapse),
       m_appearance(ComputedStyle::initialAppearance()),
       m_textDecorationStyle(ComputedStyle::initialTextDecorationStyle()),
       m_hasCurrentOpacityAnimation(false),
       m_hasCurrentTransformAnimation(false),
       m_hasCurrentFilterAnimation(false),
       m_hasCurrentBackdropFilterAnimation(false),
       m_runningOpacityAnimationOnCompositor(false),
       m_runningTransformAnimationOnCompositor(false),
       m_runningFilterAnimationOnCompositor(false),
       m_runningBackdropFilterAnimationOnCompositor(false),
-      m_isStackingContext(false),
       m_effectiveBlendMode(ComputedStyle::initialBlendMode()),
       m_touchAction(ComputedStyle::initialTouchAction()),
       m_objectFit(ComputedStyle::initialObjectFit()),
       m_isolation(ComputedStyle::initialIsolation()),
       m_contain(ComputedStyle::initialContain()),
       m_scrollBehavior(ComputedStyle::initialScrollBehavior()),
       m_scrollSnapType(ComputedStyle::initialScrollSnapType()),
       m_requiresAcceleratedCompositingForExternalReasons(false),
-      m_hasInlineTransform(false),
       m_resize(ComputedStyle::initialResize()),
       m_hasCompositorProxy(false),
       m_hasAuthorBackground(false),
       m_hasAuthorBorder(false) {
   m_maskBoxImage.setMaskDefaults();
 }
 
 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),
       m_grid(o.m_grid),
       m_gridItem(o.m_gridItem),
       m_scrollSnap(o.m_scrollSnap),
       m_content(o.m_content ? o.m_content->clone() : nullptr),
       m_counterDirectives(o.m_counterDirectives ? clone(*o.m_counterDirectives)
                                                 : nullptr),
       m_animations(o.m_animations ? CSSAnimationData::create(*o.m_animations)
@@ skipping 19 matching lines @@
       m_visitedLinkBorderTopColor(o.m_visitedLinkBorderTopColor),
       m_visitedLinkBorderBottomColor(o.m_visitedLinkBorderBottomColor),
       m_variables(o.m_variables ? o.m_variables->copy() : nullptr),
       m_alignContent(o.m_alignContent),
       m_alignItems(o.m_alignItems),
       m_alignSelf(o.m_alignSelf),
       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),
       marginBeforeCollapse(o.marginBeforeCollapse),
       marginAfterCollapse(o.marginAfterCollapse),
       m_appearance(o.m_appearance),
       m_textDecorationStyle(o.m_textDecorationStyle),
       m_hasCurrentOpacityAnimation(o.m_hasCurrentOpacityAnimation),
       m_hasCurrentTransformAnimation(o.m_hasCurrentTransformAnimation),
       m_hasCurrentFilterAnimation(o.m_hasCurrentFilterAnimation),
       m_hasCurrentBackdropFilterAnimation(
           o.m_hasCurrentBackdropFilterAnimation),
       m_runningOpacityAnimationOnCompositor(
           o.m_runningOpacityAnimationOnCompositor),
       m_runningTransformAnimationOnCompositor(
           o.m_runningTransformAnimationOnCompositor),
       m_runningFilterAnimationOnCompositor(
           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),
       m_isolation(o.m_isolation),
       m_contain(o.m_contain),
       m_scrollBehavior(o.m_scrollBehavior),
       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),
       m_hasAuthorBorder(o.m_hasAuthorBorder) {}
 
 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 &&
          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_callbackSelectors == o.m_callbackSelectors &&
          dataEquivalent(m_variables, o.m_variables) &&
          m_alignContent == o.m_alignContent && m_alignItems == o.m_alignItems &&
          m_alignSelf == o.m_alignSelf &&
          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 &&
          m_textDecorationStyle == o.m_textDecorationStyle &&
          m_hasCurrentOpacityAnimation == o.m_hasCurrentOpacityAnimation &&
          m_hasCurrentTransformAnimation == o.m_hasCurrentTransformAnimation &&
          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 &&
          m_scrollBehavior == o.m_scrollBehavior &&
          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 &&
          m_hasAuthorBorder == o.m_hasAuthorBorder;
 }
 
 bool StyleRareNonInheritedData::contentDataEquivalent(
     const StyleRareNonInheritedData& o) const {
   ContentData* a = m_content.get();
   ContentData* b = o.m_content.get();
@@ skipping 51 matching lines @@
     const StyleRareNonInheritedData& o) const {
   return dataEquivalent(m_shapeOutside, o.m_shapeOutside);
 }
 
 bool StyleRareNonInheritedData::clipPathDataEquivalent(
     const StyleRareNonInheritedData& o) const {
   return dataEquivalent(m_clipPath, o.m_clipPath);
 }
 
 }  // namespace blink