Unify GeometryPropertyTreeState and PropertyTreeState

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

Index: third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
index 60614ed935b5dad1a1cdb844eb89ff5dee284e93..5a627a037a844570a70db6d54df4fbe64439033e 100644
--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
@@ -388,14 +388,13 @@ void PaintPropertyTreeBuilder::updateLocalBorderBoxContext(
   if (!object.isBox() && !object.hasLayer())
     return;
 
-  std::unique_ptr<ObjectPaintProperties::LocalBorderBoxProperties>
+  std::unique_ptr<ObjectPaintProperties::PropertyTreeStateWithOffset>
       borderBoxContext =
-          wrapUnique(new ObjectPaintProperties::LocalBorderBoxProperties);
-  borderBoxContext->paintOffset = context.current.paintOffset;
-  borderBoxContext->geometryPropertyTreeState = GeometryPropertyTreeState(
-      context.current.transform, context.current.clip, context.currentEffect);
-  borderBoxContext->scroll = context.current.scroll;
-
+          wrapUnique(new ObjectPaintProperties::PropertyTreeStateWithOffset(
+              context.current.paintOffset,
+              PropertyTreeState(context.current.transform, context.current.clip,
+                                context.currentEffect,
+                                context.current.scroll)));
   object.getMutableForPainting()
       .ensureObjectPaintProperties()
       .setLocalBorderBoxProperties(std::move(borderBoxContext));