Refactor LocalBorderBoxProperties to use 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 669e7c1553be867de3774da5748084f3189f824a..136ea35667f372659e97da730e385716a49ceedf 100644
--- a/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintPropertyTreeBuilder.cpp
@@ -321,12 +321,9 @@ void PaintPropertyTreeBuilder::updateLocalBorderBoxContext(const LayoutObject& o
     if (!object.isBox() && !object.hasLayer())
         return;
 
+    PropertyTreeState propertyTreeState(context.current.transform, context.current.clip, context.currentEffect, context.current.scroll);
     std::unique_ptr<ObjectPaintProperties::LocalBorderBoxProperties> 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::LocalBorderBoxProperties(context.current.paintOffset, propertyTreeState));
     object.getMutableForPainting().ensureObjectPaintProperties().setLocalBorderBoxProperties(std::move(borderBoxContext));
 
 }