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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 480 matching lines @@
 
   PaintInvalidationState newPaintInvalidationState(paintInvalidationState,
                                                    *this);
   if (!shouldCheckForPaintInvalidation(newPaintInvalidationState))
     return;
 
   if (mayNeedPaintInvalidationSubtree())
     newPaintInvalidationState
         .setForceSubtreeInvalidationCheckingWithinContainer();
 
+  ObjectPaintInvalidator paintInvalidator(*this);
   LayoutRect previousVisualRect = this->previousVisualRect();
-  LayoutPoint previousPosition = previousPositionFromPaintInvalidationBacking();
+  LayoutPoint previousLocation = paintInvalidator.previousLocationInBacking();
   PaintInvalidationReason reason =
       invalidatePaintIfNeeded(newPaintInvalidationState);
   clearPaintInvalidationFlags();
 
-  if (previousPosition != previousPositionFromPaintInvalidationBacking())
+  if (previousLocation != paintInvalidator.previousLocationInBacking()) {
     newPaintInvalidationState
         .setForceSubtreeInvalidationCheckingWithinContainer();
+  }
 
   // TODO(wangxianzhu): Combine this function into LayoutObject::
   // invalidateTreeIfNeeded() when removing the following workarounds.
 
   // TODO(wangxianzhu): This is a workaround for crbug.com/533277. Will remove
   // when we enable paint offset caching.
-  if (reason != PaintInvalidationNone && hasPercentageTransform(styleRef()))
+  if (reason != PaintInvalidationNone && hasPercentageTransform(styleRef())) {
     newPaintInvalidationState
         .setForceSubtreeInvalidationCheckingWithinContainer();
+  }
 
   // TODO(wangxianzhu): This is a workaround for crbug.com/490725. We don't have
   // enough saved information to do accurate check of clipping change. Will
   // remove when we remove rect-based paint invalidation.
   if (!RuntimeEnabledFeatures::slimmingPaintV2Enabled() &&
       previousVisualRect != this->previousVisualRect() &&
       !usesCompositedScrolling()
       // Note that isLayoutView() below becomes unnecessary after the launch of
       // root layer scrolling.
-      && (hasOverflowClip() || isLayoutView()))
+      && (hasOverflowClip() || isLayoutView())) {
     newPaintInvalidationState
         .setForceSubtreeInvalidationRectUpdateWithinContainer();
+  }
 
   newPaintInvalidationState.updateForChildren(reason);
   invalidatePaintOfSubtreesIfNeeded(newPaintInvalidationState);
 }
 
 void LayoutBoxModelObject::addOutlineRectsForNormalChildren(
     Vector<LayoutRect>& rects,
     const LayoutPoint& additionalOffset,
     IncludeBlockVisualOverflowOrNot includeBlockOverflows) const {
   for (LayoutObject* child = slowFirstChild(); child;
@@ skipping 795 matching lines @@
   if (rootElementStyle->hasBackground())
     return false;
 
   if (node() != document().firstBodyElement())
     return false;
 
   return true;
 }
 
 }  // namespace blink