Combine LayoutObject::previousPaintOffset and paintOffset in paint properties

third_party/WebKit/Source/core/paint/PaintInvalidator.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 PaintInvalidator_h
 #define PaintInvalidator_h
 
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/paint/GeometryMapper.h"
 #include "wtf/Vector.h"
@@ skipping 64 matching lines @@
   LayoutRect oldVisualRect;
   LayoutRect newVisualRect;
 
   // Store the origin of the object's local coordinates in the paint
   // invalidation backing's coordinates. They are used to detect layoutObject
   // shifts that force a full invalidation and invalidation check in subtree.
   // The points do *not* account for composited scrolling. See
   // LayoutObject::adjustVisualRectForCompositedScrolling().
   LayoutPoint oldLocation;
   LayoutPoint newLocation;
-
-  // Stores the old and new offsets to paint this object, relative to the
-  // containing transform node. They are for SPv2 only.
-  LayoutPoint oldPaintOffset;
-  LayoutPoint newPaintOffset;
 };
 
 class PaintInvalidator {
  public:
   void invalidatePaintIfNeeded(FrameView&, PaintInvalidatorContext&);
-  void invalidatePaintIfNeeded(const LayoutObject&, PaintInvalidatorContext&);
+  void invalidatePaintIfNeeded(const LayoutObject&,
+                               const LayoutPoint& oldPaintOffset,
+                               PaintInvalidatorContext&);
 
   // Process objects needing paint invalidation on the next frame.
   // See the definition of PaintInvalidationDelayedFull for more details.
   void processPendingDelayedPaintInvalidations();
 
  private:
   LayoutRect mapLocalRectToPaintInvalidationBacking(
       const LayoutObject&,
       const FloatRect&,
       const PaintInvalidatorContext&);
   LayoutRect computeVisualRectInBacking(const LayoutObject&,
                                         const PaintInvalidatorContext&);
   LayoutPoint computeLocationInBacking(const LayoutObject&,
                                        const PaintInvalidatorContext&);
   void updatePaintingLayer(const LayoutObject&, PaintInvalidatorContext&);
   void updateContext(const LayoutObject&, PaintInvalidatorContext&);
 
   Vector<const LayoutObject*> m_pendingDelayedPaintInvalidations;
   GeometryMapper m_geometryMapper;
 };
 
 }  // namespace blink
 
 #endif  // PaintInvalidator_h