Store local border box property cache outside ObjectPaintProperties

third_party/WebKit/Source/core/frame/LocalFrame.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Simon Hausmann <hausmann@kde.org>
  *                     2000 Stefan Schimanski <1Stein@gmx.de>
  *                     2001 George Staikos <staikos@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
@@ skipping 197 matching lines @@
     PaintLayerPaintingInfo paintingInfo(layer, LayoutRect(boundingBox),
                                         GlobalPaintFlattenCompositingLayers,
                                         LayoutSize());
     PaintLayerFlags flags = PaintLayerHaveTransparency |
                             PaintLayerAppliedTransform |
                             PaintLayerUncachedClipRects;
     PaintRecordBuilder builder(deviceSpaceBounds(boundingBox, *m_localFrame));
     PaintLayerPainter(*layer).paint(builder.context(), paintingInfo, flags);
     PropertyTreeState borderBoxProperties = PropertyTreeState::root();
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-      borderBoxProperties =
-          *layer->layoutObject().paintProperties()->localBorderBoxProperties();
+      borderBoxProperties = *layer->layoutObject().localBorderBoxProperties();
     }
     return createDragImage(
         *m_localFrame, 1.0f,
         LayoutObject::shouldRespectImageOrientation(draggedLayoutObject),
         boundingBox, builder.endRecording(borderBoxProperties));
   }
 
  private:
   const Member<const LocalFrame> m_localFrame;
   const Member<Node> m_node;
@@ skipping 698 matching lines @@
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Enter();
 }
 
 ScopedFrameBlamer::~ScopedFrameBlamer() {
   if (m_frame && m_frame->client() && m_frame->client()->frameBlameContext())
     m_frame->client()->frameBlameContext()->Leave();
 }
 
 }  // namespace blink