[RFC] Move StyleTransformData to ComputedStyle top-level

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

 /*
  * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2011 Adobe Systems Incorporated. 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.
@@ skipping 54 matching lines @@
   RGBA32 m_color;
   unsigned m_width;
 };
 
 ASSERT_SIZE(BorderValue, SameSizeAsBorderValue);
 
 // Since different compilers/architectures pack ComputedStyle differently,
 // re-create the same structure for an accurate size comparison.
 struct SameSizeAsComputedStyle : public ComputedStyleBase,
                                  public RefCounted<ComputedStyle> {
-  void* dataRefs[7];
+  void* dataRefs[8];
   void* ownPtrs[1];
   void* dataRefSvgStyle;
 
   struct InheritedData {
     unsigned m_bitfields[2];
   } m_inheritedData;
 
   struct NonInheritedData {
     unsigned m_bitfields[3];
   } m_nonInheritedData;
@@ skipping 27 matching lines @@
   return adoptRef(new ComputedStyle(other));
 }
 
 ALWAYS_INLINE ComputedStyle::ComputedStyle()
     : ComputedStyleBase(),
       RefCounted<ComputedStyle>(),
       m_box(initialStyle().m_box),
       m_visual(initialStyle().m_visual),
       m_background(initialStyle().m_background),
       m_surround(initialStyle().m_surround),
+      m_transform(initialStyle().m_transform),
       m_rareNonInheritedData(initialStyle().m_rareNonInheritedData),
       m_rareInheritedData(initialStyle().m_rareInheritedData),
       m_styleInheritedData(initialStyle().m_styleInheritedData),
       m_svgStyle(initialStyle().m_svgStyle) {
   setBitDefaults();  // Would it be faster to copy this from the default style?
   static_assert((sizeof(InheritedData) <= 8), "InheritedData should not grow");
   static_assert((sizeof(NonInheritedData) <= 12),
                 "NonInheritedData should not grow");
 }
 
 ALWAYS_INLINE ComputedStyle::ComputedStyle(InitialStyleTag)
     : ComputedStyleBase(), RefCounted<ComputedStyle>() {
   setBitDefaults();
 
   m_box.init();
   m_visual.init();
   m_background.init();
   m_surround.init();
+  m_transform.init();
   m_rareNonInheritedData.init();
   m_rareNonInheritedData.access()->m_deprecatedFlexibleBox.init();
   m_rareNonInheritedData.access()->m_flexibleBox.init();
   m_rareNonInheritedData.access()->m_multiCol.init();
-  m_rareNonInheritedData.access()->m_transform.init();
   m_rareNonInheritedData.access()->m_willChange.init();
   m_rareNonInheritedData.access()->m_filter.init();
   m_rareNonInheritedData.access()->m_backdropFilter.init();
   m_rareNonInheritedData.access()->m_grid.init();
   m_rareNonInheritedData.access()->m_gridItem.init();
   m_rareNonInheritedData.access()->m_scrollSnap.init();
   m_rareInheritedData.init();
   m_styleInheritedData.init();
   m_svgStyle.init();
 }
 
 ALWAYS_INLINE ComputedStyle::ComputedStyle(const ComputedStyle& o)
     : ComputedStyleBase(o),
       RefCounted<ComputedStyle>(),
       m_box(o.m_box),
       m_visual(o.m_visual),
       m_background(o.m_background),
       m_surround(o.m_surround),
+      m_transform(o.m_transform),
       m_rareNonInheritedData(o.m_rareNonInheritedData),
       m_rareInheritedData(o.m_rareInheritedData),
       m_styleInheritedData(o.m_styleInheritedData),
       m_svgStyle(o.m_svgStyle),
       m_inheritedData(o.m_inheritedData),
       m_nonInheritedData(o.m_nonInheritedData) {}
 
 static StyleRecalcChange diffPseudoStyles(const ComputedStyle& oldStyle,
                                           const ComputedStyle& newStyle) {
   // If the pseudoStyles have changed, ensure layoutObject triggers setStyle.
@@ skipping 183 matching lines @@
   if (m_svgStyle != inheritParent.m_svgStyle)
     m_svgStyle.access()->inheritFrom(inheritParent.m_svgStyle.get());
 }
 
 void ComputedStyle::copyNonInheritedFromCached(const ComputedStyle& other) {
   ComputedStyleBase::copyNonInheritedFromCached(other);
   m_box = other.m_box;
   m_visual = other.m_visual;
   m_background = other.m_background;
   m_surround = other.m_surround;
+  m_transform = other.m_transform;
   m_rareNonInheritedData = other.m_rareNonInheritedData;
 
   // The flags are copied one-by-one because m_nonInheritedData.m_contains a
   // bunch of stuff other than real style data.
   // See comments for each skipped flag below.
   m_nonInheritedData.m_effectiveDisplay =
       other.m_nonInheritedData.m_effectiveDisplay;
   m_nonInheritedData.m_originalDisplay =
       other.m_nonInheritedData.m_originalDisplay;
   m_nonInheritedData.m_overflowAnchor =
       other.m_nonInheritedData.m_overflowAnchor;
   m_nonInheritedData.m_overflowX = other.m_nonInheritedData.m_overflowX;
   m_nonInheritedData.m_overflowY = other.m_nonInheritedData.m_overflowY;
   m_nonInheritedData.m_verticalAlign = other.m_nonInheritedData.m_verticalAlign;
   m_nonInheritedData.m_clear = other.m_nonInheritedData.m_clear;
   m_nonInheritedData.m_position = other.m_nonInheritedData.m_position;
   m_nonInheritedData.m_tableLayout = other.m_nonInheritedData.m_tableLayout;
   m_nonInheritedData.m_unicodeBidi = other.m_nonInheritedData.m_unicodeBidi;
   m_nonInheritedData.m_hasViewportUnits =
       other.m_nonInheritedData.m_hasViewportUnits;
   m_nonInheritedData.m_breakBefore = other.m_nonInheritedData.m_breakBefore;
   m_nonInheritedData.m_breakAfter = other.m_nonInheritedData.m_breakAfter;
   m_nonInheritedData.m_breakInside = other.m_nonInheritedData.m_breakInside;
   m_nonInheritedData.m_hasRemUnits = other.m_nonInheritedData.m_hasRemUnits;
+  m_nonInheritedData.m_isStackingContext =
+      other.m_nonInheritedData.m_isStackingContext;
 
   // Correctly set during selector matching:
   // m_nonInheritedData.m_styleType
   // m_nonInheritedData.m_pseudoBits
 
   // Set correctly while computing style for children:
   // m_nonInheritedData.m_explicitInheritance
 
   // unique() styles are not cacheable.
   DCHECK(!other.m_nonInheritedData.m_unique);
@@ skipping 124 matching lines @@
 bool ComputedStyle::loadingCustomFontsEqual(const ComputedStyle& other) const {
   return font().loadingCustomFonts() == other.font().loadingCustomFonts();
 }
 
 bool ComputedStyle::nonInheritedEqual(const ComputedStyle& other) const {
   // compare everything except the pseudoStyle pointer
   return ComputedStyleBase::nonInheritedEqual(other) &&
          m_nonInheritedData == other.m_nonInheritedData &&
          m_box == other.m_box && m_visual == other.m_visual &&
          m_background == other.m_background && m_surround == other.m_surround &&
+         m_transform == other.m_transform &&
          m_rareNonInheritedData == other.m_rareNonInheritedData &&
          m_svgStyle->nonInheritedEqual(*other.m_svgStyle);
 }
 
 bool ComputedStyle::inheritedDataShared(const ComputedStyle& other) const {
   // This is a fast check that only looks if the data structures are shared.
   // TODO(sashab): Should ComputedStyleBase have an inheritedDataShared method?
   return ComputedStyleBase::inheritedEqual(other) &&
          m_inheritedData == other.m_inheritedData &&
          m_styleInheritedData.get() == other.m_styleInheritedData.get() &&
@@ skipping 513 matching lines @@
   return false;
 }
 
 void ComputedStyle::updatePropertySpecificDifferences(
     const ComputedStyle& other,
     StyleDifference& diff) const {
   if (m_box->zIndex() != other.m_box->zIndex() ||
       isStackingContext() != other.isStackingContext())
     diff.setZIndexChanged();
 
+  if (!transformDataEquivalent(other))
+    diff.setTransformChanged();
+
   if (m_rareNonInheritedData.get() != other.m_rareNonInheritedData.get()) {
-    if (!transformDataEquivalent(other))
-      diff.setTransformChanged();
-
     if (m_rareNonInheritedData->opacity !=
         other.m_rareNonInheritedData->opacity)
       diff.setOpacityChanged();
 
     if (m_rareNonInheritedData->m_filter !=
         other.m_rareNonInheritedData->m_filter)
       diff.setFilterChanged();
 
     if (!m_rareNonInheritedData->shadowDataEquivalent(
             *other.m_rareNonInheritedData.get()))
@@ skipping 290 matching lines @@
   if (applyTransformOrigin) {
     result.translate3d(-originX, -originY, -originZ);
   }
 }
 
 void ComputedStyle::applyMotionPathTransform(
     float originX,
     float originY,
     const FloatRect& boundingBox,
     TransformationMatrix& transform) const {
-  const StyleMotionData& motionData =
-      m_rareNonInheritedData->m_transform->m_motion;
+  const StyleMotionData& motionData = m_transform->m_motion;
   // TODO(ericwilligers): crbug.com/638055 Apply offset-position.
   if (!motionData.m_path) {
     return;
   }
   const StylePath& motionPath = *motionData.m_path;
   float pathLength = motionPath.length();
   float distance = floatValueForLength(motionData.m_distance, pathLength);
   float computedDistance;
   if (motionPath.isClosed() && pathLength > 0) {
     computedDistance = fmod(distance, pathLength);
@@ skipping 887 matching lines @@
       setMarginLeft(margin);
   } else {
     if (isLeftToRightDirection())
       setMarginBottom(margin);
     else
       setMarginTop(margin);
   }
 }
 
 void ComputedStyle::setOffsetPath(PassRefPtr<StylePath> path) {
-  m_rareNonInheritedData.access()->m_transform.access()->m_motion.m_path = path;
+  m_transform.access()->m_motion.m_path = path;
 }
 
 int ComputedStyle::outlineOutsetExtent() const {
   if (!hasOutline())
     return 0;
   if (outlineStyleIsAuto()) {
     return GraphicsContext::focusRingOutsetExtent(
         outlineOffset(), std::ceil(getOutlineStrokeWidthForFocusRing()));
   }
   return std::max(0, SaturatedAddition(outlineWidth(), outlineOffset()));
@@ skipping 169 matching lines @@
     if (value < 0)
       fvalue -= 0.5f;
     else
       fvalue += 0.5f;
   }
 
   return roundForImpreciseConversion<int>(fvalue / zoomFactor);
 }
 
 }  // namespace blink