Adds support for ArrayBufferContents with external buffer.

third_party/WebKit/Source/platform/graphics/ImageBuffer.cpp

 /*
  * Copyright (c) 2008, Google Inc. All rights reserved.
  * Copyright (C) 2009 Dirk Schulze <krit@webkit.org>
  * Copyright (C) 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
@@ skipping 328 matching lines @@
   if (m_surface->colorSpace())
     bytesPerPixel = SkColorTypeBytesPerPixel(m_surface->colorType());
   CheckedNumeric<int> dataSize = bytesPerPixel;
   dataSize *= rect.width();
   dataSize *= rect.height();
   if (!dataSize.IsValid())
     return false;
 
   if (!isSurfaceValid()) {
     size_t allocSizeInBytes = rect.width() * rect.height() * bytesPerPixel;
-    void* data;
-    WTF::ArrayBufferContents::allocateMemoryOrNull(
-        allocSizeInBytes, WTF::ArrayBufferContents::ZeroInitialize, data);
+    WTF::ArrayBufferContents::ScopedData data(
+        WTF::ArrayBufferContents::allocateMemoryOrNull(
+            allocSizeInBytes, WTF::ArrayBufferContents::ZeroInitialize),
+        WTF::ArrayBufferContents::freeMemory);
     if (!data)
       return false;
-    WTF::ArrayBufferContents result(data, allocSizeInBytes,
+    WTF::ArrayBufferContents result(std::move(data), allocSizeInBytes,
                                     WTF::ArrayBufferContents::NotShared);
     result.transfer(contents);
     return true;
   }
 
   DCHECK(canvas());
 
   if (ExpensiveCanvasHeuristicParameters::GetImageDataForcesNoAcceleration &&
       !RuntimeEnabledFeatures::canvas2dFixedRenderingModeEnabled()) {
     const_cast<ImageBuffer*>(this)->disableAcceleration();
   }
 
   sk_sp<SkImage> snapshot = m_surface->newImageSnapshot(
       PreferNoAcceleration, SnapshotReasonGetImageData);
   if (!snapshot)
     return false;
 
   const bool mayHaveStrayArea =
       m_surface->isAccelerated()  // GPU readback may fail silently
       || rect.x() < 0 || rect.y() < 0 ||
       rect.maxX() > m_surface->size().width() ||
       rect.maxY() > m_surface->size().height();
   size_t allocSizeInBytes = rect.width() * rect.height() * bytesPerPixel;
-  void* data;
   WTF::ArrayBufferContents::InitializationPolicy initializationPolicy =
       mayHaveStrayArea ? WTF::ArrayBufferContents::ZeroInitialize
                        : WTF::ArrayBufferContents::DontInitialize;
-  WTF::ArrayBufferContents::allocateMemoryOrNull(allocSizeInBytes,
-                                                 initializationPolicy, data);
+  WTF::ArrayBufferContents::ScopedData data(
+      WTF::ArrayBufferContents::allocateMemoryOrNull(allocSizeInBytes,
+                                                     initializationPolicy),
+      WTF::ArrayBufferContents::freeMemory);
   if (!data)
     return false;
-  WTF::ArrayBufferContents result(data, allocSizeInBytes,
+  WTF::ArrayBufferContents result(std::move(data), allocSizeInBytes,
                                   WTF::ArrayBufferContents::NotShared);
 
   // Skia does not support unpremultiplied read with an F16 to 8888 conversion
   bool useF16Workaround = m_surface->colorType() == kRGBA_F16_SkColorType;
 
   SkAlphaType alphaType = (multiplied == Premultiplied || useF16Workaround)
                               ? kPremul_SkAlphaType
                               : kUnpremul_SkAlphaType;
   // The workaround path use a canvas draw under the hood, which can only
   // use N32 at this time.
@@ skipping 211 matching lines @@
   DCHECK(MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType));
 
   Vector<unsigned char> result;
   if (!encodeImage(mimeType, quality, &result))
     return "data:,";
 
   return "data:" + mimeType + ";base64," + base64Encode(result);
 }
 
 }  // namespace blink