Combine LayoutObject::previousPaintOffset and paintOffset in paint properties

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

Index: third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp
diff --git a/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp b/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp
index e7b0012ddef68ebd4b8514f7d386d75db40c8b96..74eecda3b676d49e0ce6ad2dd77791adb1aebe6d 100644
--- a/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp
+++ b/third_party/WebKit/Source/core/paint/ObjectPaintInvalidator.cpp
@@ -546,21 +546,14 @@ ObjectPaintInvalidatorWithContext::invalidatePaintIfNeededWithComputedReason(
       // for paint offset mutation, but incurs no pixel difference (i.e. bounds
       // stay the same) so no rect-based invalidation is issued. See
       // crbug.com/508383 and crbug.com/515977.
-      if (m_context.forcedSubtreeInvalidationFlags &
-          PaintInvalidatorContext::ForcedSubtreeInvalidationChecking) {
-        if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-          if (m_context.oldPaintOffset != m_context.newPaintOffset) {
-            reason = PaintInvalidationLocationChange;
-            break;
-          }
-        } else {
-          // For SPv1, we conservatively assume the object changed paint offset
-          // except for non-root SVG whose paint offset is always zero.
-          if (!m_object.isSVGChild()) {
-            reason = PaintInvalidationLocationChange;
-            break;
-          }
-        }
+      if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled() &&
+          (m_context.forcedSubtreeInvalidationFlags &
+           PaintInvalidatorContext::ForcedSubtreeInvalidationChecking) &&
+          !m_object.isSVGChild()) {
+        // For SPv1, we conservatively assume the object changed paint offset
+        // except for non-root SVG whose paint offset is always zero.
+        reason = PaintInvalidationLocationChange;
+        break;
       }
 
       if (m_object.isSVG() &&