Combine LayoutObject::previousPaintOffset and paintOffset in paint properties

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

Index: third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp
diff --git a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp
index 54740da2ce7fe2f14f99027821f6c05bbf3980de..ae564c4d2f8bc7bcf70a5af487d9b38a298c6b25 100644
--- a/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp
+++ b/third_party/WebKit/Source/core/paint/ObjectPaintProperties.cpp
@@ -6,25 +6,23 @@
 
 namespace blink {
 
-ObjectPaintProperties::PropertyTreeStateWithOffset
-ObjectPaintProperties::contentsProperties() const {
-  ObjectPaintProperties::PropertyTreeStateWithOffset propertiesWithOffset =
-      *localBorderBoxProperties();
+PropertyTreeState ObjectPaintProperties::contentsProperties() const {
+  PropertyTreeState properties = *localBorderBoxProperties();
 
   if (scrollTranslation())
-    propertiesWithOffset.propertyTreeState.setTransform(scrollTranslation());
+    properties.setTransform(scrollTranslation());
 
   if (scroll())
-    propertiesWithOffset.propertyTreeState.setScroll(scroll());
+    properties.setScroll(scroll());
 
   if (overflowClip())
-    propertiesWithOffset.propertyTreeState.setClip(overflowClip());
+    properties.setClip(overflowClip());
   else if (cssClip())
-    propertiesWithOffset.propertyTreeState.setClip(cssClip());
+    properties.setClip(cssClip());
 
   // TODO(chrishtr): cssClipFixedPosition needs to be handled somehow.
 
-  return propertiesWithOffset;
+  return properties;
 }
 
 }  // namespace blink