Combine LayoutObject::previousPaintOffset and paintOffset in paint properties

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

 // 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.
 
 #include "core/paint/ObjectPaintProperties.h"
 
 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