Combine LayoutObject::previousPaintOffset and paintOffset in paint properties

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
  * reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@web.de>
@@ skipping 322 matching lines @@
       layoutObject()->style()->position() != StickyPosition)
     return false;
 
   if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
     const ScrollPaintPropertyNode* ancestorTargetScrollNode;
     if (layoutObject()->style()->position() == FixedPosition) {
       ancestorTargetScrollNode = layoutObject()
                                      ->view()
                                      ->paintProperties()
                                      ->localBorderBoxProperties()
-                                     ->propertyTreeState.scroll();
+                                     ->scroll();
     } else {
       ancestorTargetScrollNode = layoutObject()
                                      ->view()
                                      ->paintProperties()
                                      ->contentsProperties()
-                                     .propertyTreeState.scroll();
+                                     .scroll();
     }
 
     return layoutObject()
                ->paintProperties()
                ->localBorderBoxProperties()
-               ->propertyTreeState.scroll() == ancestorTargetScrollNode;
+               ->scroll() == ancestorTargetScrollNode;
   }
 
   return (layoutObject()->style()->position() == FixedPosition &&
           layoutObject()->containerForFixedPosition() ==
               layoutObject()->view()) ||
          (layoutObject()->style()->position() == StickyPosition &&
           (!ancestorScrollingLayer() || ancestorScrollingLayer() == root()));
 }
 
 bool PaintLayer::scrollsWithRespectTo(const PaintLayer* other) const {
@@ skipping 2857 matching lines @@
 }
 
 void showLayerTree(const blink::LayoutObject* layoutObject) {
   if (!layoutObject) {
     LOG(INFO) << "Cannot showLayerTree. Root is (nil)";
     return;
   }
   showLayerTree(layoutObject->enclosingLayer());
 }
 #endif