Draw recorded content directly into the containing PaintCanvas, when possible.

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 110 matching lines @@
   return deviceBounds;
 }
 
 // Returns a DragImage whose bitmap contains |contents|, positioned and scaled
 // in device space.
 static std::unique_ptr<DragImage> createDragImage(
     const LocalFrame& frame,
     float opacity,
     RespectImageOrientationEnum imageOrientation,
     const FloatRect& cssBounds,
-    sk_sp<PaintRecord> contents) {
+    PaintRecordBuilder& builder,
+    const PropertyTreeState& propertyTreeState) {
   float deviceScaleFactor = frame.page()->deviceScaleFactorDeprecated();
   float pageScaleFactor = frame.page()->visualViewport().scale();
 
   FloatRect deviceBounds = deviceSpaceBounds(cssBounds, frame);
 
   AffineTransform transform;
   transform.scale(deviceScaleFactor * pageScaleFactor);
   transform.translate(-deviceBounds.x(), -deviceBounds.y());
 
-  PaintRecorder recorder;
-  PaintCanvas* canvas = recorder.beginRecording(deviceBounds);
-  canvas->concat(affineTransformToSkMatrix(transform));
-  canvas->drawPicture(contents);
-
   // Rasterize upfront, since DragImage::create() is going to do it anyway
   // (SkImage::asLegacyBitmap).
   SkSurfaceProps surfaceProps(0, kUnknown_SkPixelGeometry);
   sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(
       deviceBounds.width(), deviceBounds.height(), &surfaceProps);
   if (!surface)
     return nullptr;
-  recorder.finishRecordingAsPicture()->playback(surface->getCanvas());
+
+  SkiaPaintCanvas skiaPaintCanvas(surface->getCanvas());
+  skiaPaintCanvas.concat(affineTransformToSkMatrix(transform));
+  builder.endRecording(skiaPaintCanvas, propertyTreeState);
+
   RefPtr<Image> image = StaticBitmapImage::create(surface->makeImageSnapshot());
   float screenDeviceScaleFactor =
       frame.page()->chromeClient().screenInfo().deviceScaleFactor;
 
   return DragImage::create(image.get(), imageOrientation,
                            screenDeviceScaleFactor, InterpolationHigh, opacity);
 }
 
 class DraggedNodeImageBuilder {
   STACK_ALLOCATED();
@@ skipping 50 matching lines @@
     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();
     }
     return createDragImage(
         *m_localFrame, 1.0f,
         LayoutObject::shouldRespectImageOrientation(draggedLayoutObject),
-        boundingBox, builder.endRecording(borderBoxProperties));
+        boundingBox, builder, borderBoxProperties);
   }
 
  private:
   const Member<const LocalFrame> m_localFrame;
   const Member<Node> m_node;
 #if DCHECK_IS_ON()
   const uint64_t m_domTreeVersion;
 #endif
 };
 
@@ skipping 501 matching lines @@
   ASSERT(document()->isActive());
 
   FloatRect paintingRect = FloatRect(selection().bounds());
   GlobalPaintFlags paintFlags =
       GlobalPaintSelectionOnly | GlobalPaintFlattenCompositingLayers;
 
   PaintRecordBuilder builder(deviceSpaceBounds(paintingRect, *this));
   m_view->paintContents(builder.context(), paintFlags,
                         enclosingIntRect(paintingRect));
   return createDragImage(*this, opacity, DoNotRespectImageOrientation,
-                         paintingRect, builder.endRecording());
+                         paintingRect, builder, PropertyTreeState::root());
 }
 
 String LocalFrame::selectedText() const {
   return selection().selectedText();
 }
 
 String LocalFrame::selectedTextForClipboard() const {
   if (!document())
     return emptyString;
   DCHECK(!document()->needsLayoutTreeUpdate());
@@ skipping 171 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