Move LayoutObject::m_previousPosition... into a global map in ObjectPaintInvalidator

third_party/WebKit/Source/core/layout/LayoutObject.cpp

Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
index 4bc424f28d5ab16209b5cc6bb02ce91bff555f63..a14833d472ec46bb10f59166a022b91d4f396abb 100644
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
@@ -127,7 +127,6 @@ struct SameSizeAsLayoutObject : DisplayItemClient {
   unsigned m_bitfields;
   unsigned m_bitfields2;
   LayoutRect m_previousVisualRect;
-  LayoutPoint m_previousPosition;
 };
 
 static_assert(sizeof(LayoutObject) == sizeof(SameSizeAsLayoutObject),
@@ -1204,11 +1203,12 @@ PaintInvalidationReason LayoutObject::invalidatePaintIfNeeded(
       paintInvalidationState.paintInvalidationContainer();
   DCHECK(paintInvalidationContainer == containerForPaintInvalidation());
 
+  ObjectPaintInvalidator paintInvalidator(*this);
   context.oldVisualRect = previousVisualRect();
-  context.oldLocation = previousPositionFromPaintInvalidationBacking();
+  context.oldLocation = paintInvalidator.previousLocationInBacking();
   context.newVisualRect = paintInvalidationState.computeVisualRectInBacking();
-  context.newLocation =
-      paintInvalidationState.computePositionFromPaintInvalidationBacking();
+  context.newLocation = paintInvalidationState.computeLocationInBacking(
+      context.newVisualRect.location());
 
   IntSize adjustment =
       scrollAdjustmentForPaintInvalidation(paintInvalidationContainer);
@@ -1218,7 +1218,7 @@ PaintInvalidationReason LayoutObject::invalidatePaintIfNeeded(
   adjustVisualRectForRasterEffects(context.newVisualRect);
 
   setPreviousVisualRect(context.newVisualRect);
-  setPreviousPositionFromPaintInvalidationBacking(context.newLocation);
+  paintInvalidator.setPreviousLocationInBacking(context.newLocation);
 
   if (!shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState() &&
       paintInvalidationState