Blob creation methods for ImageBitmap.

Source/core/page/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/page/ImageBitmap.h"
 
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
@@ skipping 101 matching lines @@
         m_imageElement->addClient(this);
         m_bitmap = 0;
         m_bitmapOffset = srcRect.location();
     } else {
         IntRect adjustedCropRect(IntPoint(cropRect.x() -oldBitmapRect.x(), cropRect.y() - oldBitmapRect.y()), cropRect.size());
         m_bitmap = cropImage(bitmap->bitmapImage().get(), adjustedCropRect);
     }
     ScriptWrappable::init(this);
 }
 
+ImageBitmap::ImageBitmap(Image* image, const IntRect& cropRect)
+    : m_cropRect(cropRect)
+    , m_imageElement(0)
+{
+    IntRect srcRect = intersection(cropRect, IntRect(IntPoint(), image->size()));
+    m_bitmap = cropImage(image, cropRect);
+    m_bitmapRect = IntRect(IntPoint(max(0, -cropRect.x()), max(0, -cropRect.y())),  srcRect.size());
+
+    ScriptWrappable::init(this);
+}
+
 ImageBitmap::~ImageBitmap()
 {
     if (m_imageElement)
         m_imageElement->removeClient(this);
 }
 
 PassRefPtr<ImageBitmap> ImageBitmap::create(HTMLImageElement* image, const IntRect& cropRect)
 {
     IntRect normalizedCropRect = normalizeRect(cropRect);
-    RefPtr<ImageBitmap> imageBitmap(adoptRef(new ImageBitmap(image, normalizedCropRect)));
-    return imageBitmap.release();
+    return adoptRef(new ImageBitmap(image, normalizedCropRect));
 }
 
 PassRefPtr<ImageBitmap> ImageBitmap::create(HTMLVideoElement* video, const IntRect& cropRect)
 {
     IntRect normalizedCropRect = normalizeRect(cropRect);
-    RefPtr<ImageBitmap> imageBitmap(adoptRef(new ImageBitmap(video, normalizedCropRect)));
-    return imageBitmap.release();
+    return adoptRef(new ImageBitmap(video, normalizedCropRect));
 }
 
 PassRefPtr<ImageBitmap> ImageBitmap::create(HTMLCanvasElement* canvas, const IntRect& cropRect)
 {
     IntRect normalizedCropRect = normalizeRect(cropRect);
-    RefPtr<ImageBitmap> imageBitmap(adoptRef(new ImageBitmap(canvas, normalizedCropRect)));
-    return imageBitmap.release();
+    return adoptRef(new ImageBitmap(canvas, normalizedCropRect));
 }
 
 PassRefPtr<ImageBitmap> ImageBitmap::create(ImageData* data, const IntRect& cropRect)
 {
     IntRect normalizedCropRect = normalizeRect(cropRect);
-    RefPtr<ImageBitmap> imageBitmap(adoptRef(new ImageBitmap(data, normalizedCropRect)));
-    return imageBitmap.release();
+    return adoptRef(new ImageBitmap(data, normalizedCropRect));
 }
 
 PassRefPtr<ImageBitmap> ImageBitmap::create(ImageBitmap* bitmap, const IntRect& cropRect)
 {
     IntRect normalizedCropRect = normalizeRect(cropRect);
-    RefPtr<ImageBitmap> imageBitmap(adoptRef(new ImageBitmap(bitmap, normalizedCropRect)));
-    return imageBitmap.release();
+    return adoptRef(new ImageBitmap(bitmap, normalizedCropRect));
+}
+
+PassRefPtr<ImageBitmap> ImageBitmap::create(Image* image, const IntRect& cropRect)
+{
+    IntRect normalizedCropRect = normalizeRect(cropRect);
+    return adoptRef(new ImageBitmap(image, normalizedCropRect));
 }
 
 void ImageBitmap::notifyImageSourceChanged()
 {
     m_bitmap = cropImage(m_imageElement->cachedImage()->image(), m_cropRect);
     m_bitmapOffset = IntPoint();
     m_imageElement = 0;
 }
 
 PassRefPtr<Image> ImageBitmap::bitmapImage() const
 {
     ASSERT((m_imageElement || m_bitmap) && (!m_imageElement || !m_bitmap));
     if (m_imageElement)
         return m_imageElement->cachedImage()->image();
     return m_bitmap;
 }
 
 }