Combine LayoutObject::previousPaintOffset and paintOffset in paint properties

third_party/WebKit/Source/core/paint/PaintInvalidator.h

Index: third_party/WebKit/Source/core/paint/PaintInvalidator.h
diff --git a/third_party/WebKit/Source/core/paint/PaintInvalidator.h b/third_party/WebKit/Source/core/paint/PaintInvalidator.h
index e93ec3c9522cfefb34f97121c49b9be527e70928..eb733986a3a9225b8242c525e0bd1341639ee439 100644
--- a/third_party/WebKit/Source/core/paint/PaintInvalidator.h
+++ b/third_party/WebKit/Source/core/paint/PaintInvalidator.h
@@ -82,17 +82,14 @@ struct PaintInvalidatorContext {
   // 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.