Combine LayoutObject::previousPaintOffset and paintOffset in paint properties

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 92 matching lines @@
   CHECK_PROPERTY_EQ("the layout object (" << object.debugName() << ")", \
                     original, updated)
 
 class FindObjectPropertiesNeedingUpdateScope {
  public:
   FindObjectPropertiesNeedingUpdateScope(
       const LayoutObject& object,
       PaintPropertyTreeBuilderContext& context)
       : m_object(object),
         m_neededPaintPropertyUpdate(object.needsPaintPropertyUpdate()),
-        m_neededForcedSubtreeUpdate(context.forceSubtreeUpdate) {
+        m_neededForcedSubtreeUpdate(context.forceSubtreeUpdate),
+        m_originalPaintOffset(object.paintOffset()) {
     // No need to check if an update was already needed.
     if (m_neededPaintPropertyUpdate || m_neededForcedSubtreeUpdate)
       return;
 
     // Mark the properties as needing an update to ensure they are rebuilt.
     m_object.getMutableForPainting()
         .setOnlyThisNeedsPaintPropertyUpdateForTesting();
 
     if (const auto* properties = m_object.paintProperties())
       m_originalProperties = properties->clone();
   }
 
   ~FindObjectPropertiesNeedingUpdateScope() {
     // 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 LayoutObject should have been marked as needing an update with
     //    LayoutObject::setNeedsPaintPropertyUpdate().
     // 2) The PrePaintTreeWalk should have had a forced subtree update (see:
     //    PaintPropertyTreeBuilderContext::forceSubtreeUpdate).
+    DCHECK_OBJECT_PROPERTY_EQ(m_object, &m_originalPaintOffset,
+                              &m_object.paintOffset());
     const auto* objectProperties = m_object.paintProperties();
     if (m_originalProperties && objectProperties) {
       DCHECK_OBJECT_PROPERTY_EQ(m_object,
                                 m_originalProperties->paintOffsetTranslation(),
                                 objectProperties->paintOffsetTranslation());
       DCHECK_OBJECT_PROPERTY_EQ(m_object, m_originalProperties->transform(),
                                 objectProperties->transform());
       DCHECK_OBJECT_PROPERTY_EQ(m_object, m_originalProperties->effect(),
                                 objectProperties->effect());
       DCHECK_OBJECT_PROPERTY_EQ(m_object, m_originalProperties->cssClip(),
@@ skipping 18 matching lines @@
                                 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->paintOffset,
-                                  &objectBorderBox->paintOffset);
-        DCHECK_OBJECT_PROPERTY_EQ(
-            m_object, originalBorderBox->propertyTreeState.transform(),
-            objectBorderBox->propertyTreeState.transform());
-        DCHECK_OBJECT_PROPERTY_EQ(m_object,
-                                  originalBorderBox->propertyTreeState.clip(),
-                                  objectBorderBox->propertyTreeState.clip());
-        DCHECK_OBJECT_PROPERTY_EQ(m_object,
-                                  originalBorderBox->propertyTreeState.effect(),
-                                  objectBorderBox->propertyTreeState.effect());
-        DCHECK_OBJECT_PROPERTY_EQ(m_object,
-                                  originalBorderBox->propertyTreeState.scroll(),
-                                  objectBorderBox->propertyTreeState.scroll());
+        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