Unify GeometryPropertyTreeState and PropertyTreeState

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

 // Copyright 2015 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/PaintPropertyTreeBuilder.h"
 
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/layout/LayoutInline.h"
@@ skipping 370 matching lines @@
     properties->clearCssClip();
 }
 
 void PaintPropertyTreeBuilder::updateLocalBorderBoxContext(
     const LayoutObject& object,
     PaintPropertyTreeBuilderContext& context) {
   // Avoid adding an ObjectPaintProperties for non-boxes to save memory, since we don't need them at the moment.
   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));
 }
 
 // TODO(trchen): Remove this once we bake the paint offset into frameRect.
 void PaintPropertyTreeBuilder::updateScrollbarPaintOffset(
     const LayoutObject& object,
     const PaintPropertyTreeBuilderContext& context) {
   IntPoint roundedPaintOffset = roundedIntPoint(context.current.paintOffset);
@@ skipping 334 matching lines @@
     return;
 
   updateOverflowClip(object, context);
   updatePerspective(object, context);
   updateSvgLocalToBorderBoxTransform(object, context);
   updateScrollAndScrollTranslation(object, context);
   updateOutOfFlowContext(object, context);
 }
 
 }  // namespace blink