Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / frame / ImageBitmap.cpp

diff --git a/src/third_party/WebKit/Source/core/frame/ImageBitmap.cpp b/src/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
index 9c539b1..60e52ee 100644 (file)
--- a/src/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
+++ b/src/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
@@ -48,8 +48,6 @@ ImageBitmap::ImageBitmap(HTMLImageElement* image, const IntRect& cropRect)
         m_imageElement = nullptr;
     else
         m_imageElement->addClient(this);
-
-    ScriptWrappable::init(this);
 }
 
 ImageBitmap::ImageBitmap(HTMLVideoElement* video, const IntRect& cropRect)
@@ -75,8 +73,6 @@ ImageBitmap::ImageBitmap(HTMLVideoElement* video, const IntRect& cropRect)
     video->paintCurrentFrameInContext(c, videoRect);
     m_bitmap = buf->copyImage(DontCopyBackingStore);
     m_bitmapRect = IntRect(IntPoint(std::max(0, -cropRect.x()), std::max(0, -cropRect.y())), srcRect.size());
-
-    ScriptWrappable::init(this);
 }
 
 ImageBitmap::ImageBitmap(HTMLCanvasElement* canvas, const IntRect& cropRect)
@@ -91,8 +87,6 @@ ImageBitmap::ImageBitmap(HTMLCanvasElement* canvas, const IntRect& cropRect)
     IntRect srcRect = intersection(cropRect, IntRect(IntPoint(), canvas->size()));
     m_bitmapRect = IntRect(IntPoint(std::max(0, -cropRect.x()), std::max(0, -cropRect.y())), srcRect.size());
     m_bitmap = cropImage(canvas->buffer()->copyImage(CopyBackingStore).get(), cropRect);
-
-    ScriptWrappable::init(this);
 }
 
 ImageBitmap::ImageBitmap(ImageData* data, const IntRect& cropRect)
@@ -110,8 +104,6 @@ ImageBitmap::ImageBitmap(ImageData* data, const IntRect& cropRect)
 
     m_bitmap = buf->copyImage(DontCopyBackingStore);
     m_bitmapRect = IntRect(IntPoint(std::max(0, -cropRect.x()), std::max(0, -cropRect.y())),  srcRect.size());
-
-    ScriptWrappable::init(this);
 }
 
 ImageBitmap::ImageBitmap(ImageBitmap* bitmap, const IntRect& cropRect)
@@ -131,8 +123,6 @@ ImageBitmap::ImageBitmap(ImageBitmap* bitmap, const IntRect& cropRect)
         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)
@@ -142,8 +132,6 @@ ImageBitmap::ImageBitmap(Image* image, const IntRect& cropRect)
     IntRect srcRect = intersection(cropRect, IntRect(IntPoint(), image->size()));
     m_bitmap = cropImage(image, cropRect);
     m_bitmapRect = IntRect(IntPoint(std::max(0, -cropRect.x()), std::max(0, -cropRect.y())),  srcRect.size());
-
-    ScriptWrappable::init(this);
 }
 
 ImageBitmap::~ImageBitmap()
@@ -235,4 +223,4 @@ void ImageBitmap::trace(Visitor* visitor)
     ImageLoaderClient::trace(visitor);
 }
 
-}
+} // namespace blink