Use a raster SkImage in DragImageBuilder

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 76 matching lines @@
 #include "platform/graphics/paint/SkPictureBuilder.h"
 #include "platform/graphics/paint/TransformDisplayItem.h"
 #include "platform/json/JSONValues.h"
 #include "platform/plugins/PluginData.h"
 #include "platform/text/TextStream.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/InterfaceRegistry.h"
 #include "public/platform/WebScreenInfo.h"
 #include "public/platform/WebViewScheduler.h"
 #include "third_party/skia/include/core/SkImage.h"
+#include "third_party/skia/include/core/SkSurface.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/StdLibExtras.h"
 #include <memory>
 
 namespace blink {
 
 using namespace HTMLNames;
 
 namespace {
 
@@ skipping 29 matching lines @@
 
   std::unique_ptr<DragImage> createImage(
       float opacity,
       RespectImageOrientationEnum imageOrientation =
           DoNotRespectImageOrientation) {
     context().getPaintController().endItem<EndTransformDisplayItem>(
         *m_pictureBuilder);
     // TODO(fmalita): endRecording() should return a non-const SKP.
     sk_sp<SkPicture> recording(
         const_cast<SkPicture*>(m_pictureBuilder->endRecording().release()));
-    sk_sp<SkImage> skImage = SkImage::MakeFromPicture(
-        std::move(recording),
-        SkISize::Make(m_bounds.width(), m_bounds.height()), nullptr, nullptr);
-    RefPtr<Image> image = StaticBitmapImage::create(std::move(skImage));
+
+    // Rasterize upfront, since DragImage::create() is going to do it anyway
+    // (SkImage::asLegacyBitmap).
+    sk_sp<SkSurface> surface =
+        SkSurface::MakeRasterN32Premul(m_bounds.width(), m_bounds.height());
+    surface->getCanvas()->drawPicture(recording);
+    RefPtr<Image> image =
+        StaticBitmapImage::create(surface->makeImageSnapshot());
+
     float screenDeviceScaleFactor =
         m_localFrame->page()->chromeClient().screenInfo().deviceScaleFactor;
 
     return DragImage::create(image.get(), imageOrientation,
                              screenDeviceScaleFactor, InterpolationHigh,
                              opacity);
   }
 
  private:
   const Member<const LocalFrame> m_localFrame;
@@ skipping 767 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