Move scroll paint property nodes to be owned by the transform tree

third_party/WebKit/Source/core/paint/FindPropertiesNeedingUpdate.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef FindPropertiesNeedingUpdate_h
 #define FindPropertiesNeedingUpdate_h
 
 #if DCHECK_IS_ON()
 namespace blink {
 
@@ skipping 44 matching lines @@
 
     // Mark the properties as needing an update to ensure they are rebuilt.
     m_frameView->setOnlyThisNeedsPaintPropertyUpdateForTesting();
 
     if (auto* preTranslation = m_frameView->preTranslation())
       m_originalPreTranslation = preTranslation->clone();
     if (auto* contentClip = m_frameView->contentClip())
       m_originalContentClip = contentClip->clone();
     if (auto* scrollTranslation = m_frameView->scrollTranslation())
       m_originalScrollTranslation = scrollTranslation->clone();
-    if (auto* scroll = m_frameView->scroll())
-      m_originalScroll = scroll->clone();
   }
 
   ~FindFrameViewPropertiesNeedingUpdateScope() {
     // No need to check if an update was already needed.
     if (m_neededPaintPropertyUpdate || m_neededForcedSubtreeUpdate)
       return;
 
     // If these checks fail, the paint properties changed unexpectedly. This is
     // due to missing one of these paint property invalidations:
     // 1) The FrameView should have been marked as needing an update with
     //    FrameView::setNeedsPaintPropertyUpdate().
     // 2) The PrePaintTreeWalk should have had a forced subtree update (see:
     //    PaintPropertyTreeBuilderContext::forceSubtreeUpdate).
     DCHECK_FRAMEVIEW_PROPERTY_EQ(m_originalPreTranslation,
                                  m_frameView->preTranslation());
     DCHECK_FRAMEVIEW_PROPERTY_EQ(m_originalContentClip,
                                  m_frameView->contentClip());
     DCHECK_FRAMEVIEW_PROPERTY_EQ(m_originalScrollTranslation,
                                  m_frameView->scrollTranslation());
-    DCHECK_FRAMEVIEW_PROPERTY_EQ(m_originalScroll, m_frameView->scroll());
 
     // Restore original clean bit.
     m_frameView->clearNeedsPaintPropertyUpdate();
   }
 
  private:
   Persistent<FrameView> m_frameView;
   bool m_neededPaintPropertyUpdate;
   bool m_neededForcedSubtreeUpdate;
   RefPtr<TransformPaintPropertyNode> m_originalPreTranslation;
   RefPtr<ClipPaintPropertyNode> m_originalContentClip;
   RefPtr<TransformPaintPropertyNode> m_originalScrollTranslation;
-  RefPtr<ScrollPaintPropertyNode> m_originalScroll;
 };
 
 #define DCHECK_OBJECT_PROPERTY_EQ(object, original, updated)            \
   CHECK_PROPERTY_EQ("the layout object (" << object.debugName() << ")", \
                     original, updated)
 
 class FindObjectPropertiesNeedingUpdateScope {
  public:
   FindObjectPropertiesNeedingUpdateScope(
       const LayoutObject& object,
@@ skipping 48 matching lines @@
                                 objectProperties->overflowClip());
       DCHECK_OBJECT_PROPERTY_EQ(m_object, m_originalProperties->perspective(),
                                 objectProperties->perspective());
       DCHECK_OBJECT_PROPERTY_EQ(
           m_object, m_originalProperties->svgLocalToBorderBoxTransform(),
           objectProperties->svgLocalToBorderBoxTransform());
       DCHECK_OBJECT_PROPERTY_EQ(m_object,
                                 m_originalProperties->scrollTranslation(),
                                 objectProperties->scrollTranslation());
       DCHECK_OBJECT_PROPERTY_EQ(m_object,
-                                m_originalProperties->scrollTranslation(),
-                                objectProperties->scrollTranslation());
-      DCHECK_OBJECT_PROPERTY_EQ(m_object,
                                 m_originalProperties->scrollbarPaintOffset(),
                                 objectProperties->scrollbarPaintOffset());
       const auto* originalBorderBox =
           m_originalProperties->localBorderBoxProperties();
       const auto* objectBorderBox =
           objectProperties->localBorderBoxProperties();
       if (originalBorderBox && objectBorderBox) {
         DCHECK_OBJECT_PROPERTY_EQ(m_object, originalBorderBox->transform(),
                                   objectBorderBox->transform());
         DCHECK_OBJECT_PROPERTY_EQ(m_object, originalBorderBox->clip(),
                                   objectBorderBox->clip());
         DCHECK_OBJECT_PROPERTY_EQ(m_object, originalBorderBox->effect(),
                                   objectBorderBox->effect());
-        DCHECK_OBJECT_PROPERTY_EQ(m_object, originalBorderBox->scroll(),
-                                  objectBorderBox->scroll());
       } else {
         DCHECK_EQ(!!originalBorderBox, !!objectBorderBox)
             << " Object: " << m_object.debugName();
       }
     } else {
       DCHECK_EQ(!!m_originalProperties, !!objectProperties)
           << " Object: " << m_object.debugName();
     }
     // Restore original clean bit.
     m_object.getMutableForPainting().clearNeedsPaintPropertyUpdateForTesting();
   }
 
  private:
   const LayoutObject& m_object;
   bool m_neededPaintPropertyUpdate;
   bool m_neededForcedSubtreeUpdate;
   LayoutPoint m_originalPaintOffset;
   std::unique_ptr<const ObjectPaintProperties> m_originalProperties;
 };
 
 }  // namespace blink
 #endif  // DCHECK_IS_ON()
 
 #endif  // FindPropertiesNeedingUpdate_h