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

third_party/WebKit/Source/core/paint/PaintLayer.cpp

Index: third_party/WebKit/Source/core/paint/PaintLayer.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
index db3c3beb68441d732cc9ccfd2f4c5c89a48f06f0..7d8cc1a7c9af5f96fc11f4fe0f6e479e44cf0e89 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
@@ -101,15 +101,11 @@ static CompositingQueryMode gCompositingQueryMode =
 
 struct SameSizeAsPaintLayer : DisplayItemClient {
   int bitFields;
-  void* pointers[10];

[chrishtr, 2016/11/08 00:48:42]

This was wrong before.

+  void* pointers[11];
   LayoutUnit layoutUnits[4];
   IntSize size;
   Persistent<PaintLayerScrollableArea> scrollableArea;
   struct {
-    IntRect rect, rect2;
-    void* pointers[2];
-  } ancestorCompositingInputs;
-  struct {
     IntSize size;
     void* pointer;
     LayoutRect rect;
@@ -1025,14 +1021,9 @@ void PaintLayer::setNeedsCompositingInputsUpdate() {
 
 void PaintLayer::updateAncestorDependentCompositingInputs(
     const AncestorDependentCompositingInputs& compositingInputs,
-    const RareAncestorDependentCompositingInputs& rareCompositingInputs,
     bool hasAncestorWithClipPath) {
-  m_ancestorDependentCompositingInputs = compositingInputs;
-  if (rareCompositingInputs.isDefault())
-    m_rareAncestorDependentCompositingInputs.reset();
-  else
-    m_rareAncestorDependentCompositingInputs = wrapUnique(
-        new RareAncestorDependentCompositingInputs(rareCompositingInputs));
+  m_ancestorDependentCompositingInputs =
+      wrapUnique(new AncestorDependentCompositingInputs(compositingInputs));
   m_hasAncestorWithClipPath = hasAncestorWithClipPath;
   m_needsAncestorDependentCompositingInputsUpdate = false;
 }