Reland of: Make Imagebitmap Transferable

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

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/frame/ImageBitmap.h"
 
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLVideoElement.h"
 #include "core/html/ImageData.h"
@@ skipping 69 matching lines @@
 ImageBitmap::ImageBitmap(ImageBitmap* bitmap, const IntRect& cropRect)
 {
     m_image = cropImage(bitmap->skImage(), cropRect);
 }
 
 ImageBitmap::ImageBitmap(Image* image, const IntRect& cropRect)
 {
     m_image = cropImage(image->imageForCurrentFrame(), cropRect);
 }
 
+ImageBitmap::ImageBitmap(SkImage* image)
+{
+    m_image = adoptRef(image);
+}
+
+PassRefPtr<SkImage> ImageBitmap::transfer()
+{
+    return m_image.release();

[Justin Novosad, 2015/11/11 05:29:08]

From the postMessage spec: "If any object is listed in transfer more than once,
or any of the Transferable objects listed in transfer are marked as neutered,
then throw a DataCloneError exception and abort these steps."  
I suppose handling this situation is already taken care of some place else, but
here we should at least ASSERT(!isNeutered())

[xidachen, 2015/11/16 18:00:51]

Done.

+}
+
 ImageBitmap::~ImageBitmap()
 {
 }
 
 PassRefPtrWillBeRawPtr<ImageBitmap> ImageBitmap::create(HTMLImageElement* image, const IntRect& cropRect)
 {
     IntRect normalizedCropRect = normalizeRect(cropRect);
     return adoptRefWillBeNoop(new ImageBitmap(image, normalizedCropRect));
 }
 
@@ skipping 20 matching lines @@
     IntRect normalizedCropRect = normalizeRect(cropRect);
     return adoptRefWillBeNoop(new ImageBitmap(bitmap, normalizedCropRect));
 }
 
 PassRefPtrWillBeRawPtr<ImageBitmap> ImageBitmap::create(Image* image, const IntRect& cropRect)
 {
     IntRect normalizedCropRect = normalizeRect(cropRect);
     return adoptRefWillBeNoop(new ImageBitmap(image, normalizedCropRect));
 }
 
+PassRefPtrWillBeRawPtr<ImageBitmap> ImageBitmap::create(SkImage* image)
+{
+    return adoptRefWillBeNoop(new ImageBitmap(image));
+}
+
 PassRefPtr<SkImage> ImageBitmap::cropImage(PassRefPtr<SkImage> image, const IntRect& cropRect)
 {
     ASSERT(image);
 
     IntRect imgRect = IntRect(IntPoint(), IntSize(image->width(), image->height()));
     const IntRect srcRect = intersection(imgRect, cropRect);
 
     if (cropRect == srcRect)
         return adoptRef(image->newSubset(srcRect));
 
@@ skipping 31 matching lines @@
 {
     return FloatSize(width(), height());
 }
 
 DEFINE_TRACE(ImageBitmap)
 {
     ImageLoaderClient::trace(visitor);
 }
 
 } // namespace blink