Removing GraphicsContext from ImageBuffer

Source/platform/DragImage.cpp

 /*
  * Copyright (C) 2007 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 21 matching lines @@
 #include "platform/fonts/FontDescription.h"
 #include "platform/fonts/FontMetrics.h"
 #include "platform/geometry/FloatPoint.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/graphics/BitmapImage.h"
 #include "platform/graphics/Color.h"
 #include "platform/graphics/GraphicsContext.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/ImageBuffer.h"
-#include "platform/graphics/paint/DisplayItemListContextRecorder.h"
 #include "platform/graphics/paint/DrawingRecorder.h"
+#include "platform/graphics/paint/SkPictureBuilder.h"
 #include "platform/text/BidiTextRun.h"
 #include "platform/text/StringTruncator.h"
 #include "platform/text/TextRun.h"
 #include "platform/transforms/AffineTransform.h"
 #include "platform/weborigin/KURL.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkMatrix.h"
 #include "wtf/PassOwnPtr.h"
@@ skipping 109 matching lines @@
     }
 
     // We now know how big the image needs to be, so we create and
     // fill the background
     IntSize scaledImageSize = imageSize;
     scaledImageSize.scale(deviceScaleFactor);
     OwnPtr<ImageBuffer> buffer(ImageBuffer::create(scaledImageSize));
     if (!buffer)
         return nullptr;
 
+    SkPictureBuilder pictureBuilder(FloatRect(0, 0, scaledImageSize.width(), scaledImageSize.height()));
     {
-        DisplayItemListContextRecorder contextRecorder(*buffer->context());
-        GraphicsContext& paintContext = contextRecorder.context();
+        GraphicsContext& paintContext = pictureBuilder.context();
 
         IntRect rect(IntPoint(), imageSize);
         DrawingRecorder drawingRecorder(paintContext, *buffer, DisplayItem::DragImage, rect);
         if (!drawingRecorder.canUseCachedDrawing()) {
             paintContext.scale(deviceScaleFactor, deviceScaleFactor);
 
             const float DragLabelRadius = 5;
             const IntSize radii(DragLabelRadius, DragLabelRadius);
 
             const Color backgroundColor(140, 140, 140);
@@ skipping 15 matching lines @@
             TextRun textRun = textRunWithDirectionality(label, &hasStrongDirectionality);
             IntPoint textPos(kDragLabelBorderX, kDragLabelBorderY + labelFont.fontDescription().computedPixelSize());
             if (hasStrongDirectionality && textRun.direction() == RTL) {
                 float textWidth = labelFont.width(textRun);
                 int availableWidth = imageSize.width() - kDragLabelBorderX * 2;
                 textPos.setX(availableWidth - ceilf(textWidth));
             }
             paintContext.drawBidiText(labelFont, TextRunPaintInfo(textRun), FloatPoint(textPos));
         }
     }
+    RefPtr<const SkPicture> recording = pictureBuilder.endRecording();
+    buffer->canvas()->drawPicture(recording.get());
 
     RefPtr<Image> image = buffer->copyImage();
     return DragImage::create(image.get(), DoNotRespectImageOrientation, deviceScaleFactor);
 }
 
 DragImage::DragImage(const SkBitmap& bitmap, float resolutionScale, InterpolationQuality interpolationQuality)
     : m_bitmap(bitmap)
     , m_resolutionScale(resolutionScale)
     , m_interpolationQuality(interpolationQuality)
 {
@@ skipping 57 matching lines @@
             *pixel = SkPreMultiplyARGB(
                 SkColorGetA(*pixel) * fraction,
                 SkColorGetR(*pixel),
                 SkColorGetG(*pixel),
                 SkColorGetB(*pixel));
         }
     }
 }
 
 } // namespace blink