Move all ancestor-dependent properties out of PaintLayer and into an aux. struct.

third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp

Index: third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
index b7d4b8c22446a55db390781615d6940e9e1368d0..1c567e638d648337bec4ec130acd580c7f999139 100644
--- a/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositingInputsUpdater.cpp
@@ -144,7 +144,6 @@ void CompositingInputsUpdater::updateRecursive(PaintLayer* layer,
 
   if (updateType == ForceUpdate) {
     PaintLayer::AncestorDependentCompositingInputs properties;
-    PaintLayer::RareAncestorDependentCompositingInputs rareProperties;
 
     if (!layer->isRootLayer()) {
       if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
@@ -168,16 +167,16 @@ void CompositingInputsUpdater::updateRecursive(PaintLayer* layer,
       }
 
       const PaintLayer* parent = layer->parent();
-      rareProperties.opacityAncestor =
+      properties.opacityAncestor =
           parent->isTransparent() ? parent : parent->opacityAncestor();
-      rareProperties.transformAncestor =
+      properties.transformAncestor =
           parent->transform() ? parent : parent->transformAncestor();
-      rareProperties.filterAncestor = parent->hasFilterInducingProperty()
-                                          ? parent
-                                          : parent->filterAncestor();
+      properties.filterAncestor = parent->hasFilterInducingProperty()
+                                      ? parent
+                                      : parent->filterAncestor();
       bool layerIsFixedPosition =
           layer->layoutObject()->style()->position() == FixedPosition;
-      rareProperties.nearestFixedPositionLayer =
+      properties.nearestFixedPositionLayer =
           layerIsFixedPosition ? layer : parent->nearestFixedPositionLayer();
 
       if (info.hasAncestorWithClipRelatedProperty) {
@@ -198,7 +197,7 @@ void CompositingInputsUpdater::updateRecursive(PaintLayer* layer,
                   ? properties.clippingContainer->enclosingLayer()
                   : layer->compositor()->rootLayer();
           if (hasClippedStackingAncestor(layer, clippingLayer))
-            rareProperties.clipParent = clippingLayer;
+            properties.clipParent = clippingLayer;
         }
       }
 
@@ -208,22 +207,21 @@ void CompositingInputsUpdater::updateRecursive(PaintLayer* layer,
         const PaintLayer* parentLayerOnContainingBlockChain =
             findParentLayerOnContainingBlockChain(containingBlock);
 
-        rareProperties.ancestorScrollingLayer =
+        properties.ancestorScrollingLayer =
             parentLayerOnContainingBlockChain->ancestorScrollingLayer();
         if (parentLayerOnContainingBlockChain->scrollsOverflow())
-          rareProperties.ancestorScrollingLayer =
-              parentLayerOnContainingBlockChain;
+          properties.ancestorScrollingLayer = parentLayerOnContainingBlockChain;
 
         if (layer->stackingNode()->isStacked() &&
-            rareProperties.ancestorScrollingLayer &&
+            properties.ancestorScrollingLayer &&
             !info.ancestorStackingContext->layoutObject()->isDescendantOf(
-                rareProperties.ancestorScrollingLayer->layoutObject()))
-          rareProperties.scrollParent = rareProperties.ancestorScrollingLayer;
+                properties.ancestorScrollingLayer->layoutObject()))
+          properties.scrollParent = properties.ancestorScrollingLayer;
       }
     }
 
     layer->updateAncestorDependentCompositingInputs(
-        properties, rareProperties, info.hasAncestorWithClipPath);
+        properties, info.hasAncestorWithClipPath);
   }
 
   if (layer->stackingNode()->isStackingContext())