Add a origin clean flag in ImageBitmap class

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

Index: third_party/WebKit/Source/core/frame/ImageBitmap.cpp
diff --git a/third_party/WebKit/Source/core/frame/ImageBitmap.cpp b/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
index 2d42f461bf49503a4ec7e1c1d82b4fc10b5c63db..22d97a6df4ee00f658ee9286e056a572f4146029 100644
--- a/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
+++ b/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
@@ -28,12 +28,12 @@ static PassRefPtr<StaticBitmapImage> cropImage(Image* image, const IntRect& crop
     const IntRect srcRect = intersection(imgRect, cropRect);
 
     if (cropRect == srcRect)
-        return StaticBitmapImage::create(adoptRef(image->imageForCurrentFrame()->newSubset(srcRect)));
+        return StaticBitmapImage::create(adoptRef(image->imageForCurrentFrame()->newSubset(srcRect)), true);
 
     RefPtr<SkSurface> surface = adoptRef(SkSurface::NewRasterN32Premul(cropRect.width(), cropRect.height()));
 
     if (srcRect.isEmpty())
-        return StaticBitmapImage::create(adoptRef(surface->newImageSnapshot()));
+        return StaticBitmapImage::create(adoptRef(surface->newImageSnapshot()), true);
 
     SkScalar dstLeft = std::min(0, -cropRect.x());
     SkScalar dstTop = std::min(0, -cropRect.y());
@@ -42,15 +42,16 @@ static PassRefPtr<StaticBitmapImage> cropImage(Image* image, const IntRect& crop
     if (cropRect.y() < 0)
         dstTop = -cropRect.y();
     surface->getCanvas()->drawImage(image->imageForCurrentFrame().get(), dstLeft, dstTop);
-    return StaticBitmapImage::create(adoptRef(surface->newImageSnapshot()));
+    return StaticBitmapImage::create(adoptRef(surface->newImageSnapshot()), true);
 }
 
-ImageBitmap::ImageBitmap(HTMLImageElement* image, const IntRect& cropRect)
+ImageBitmap::ImageBitmap(HTMLImageElement* image, const IntRect& cropRect, Document* document)
 {
+    m_isOriginClean = !image->wouldTaintOrigin(document->securityOrigin());
     m_image = cropImage(image->cachedImage()->image(), cropRect);
 }
 
-ImageBitmap::ImageBitmap(HTMLVideoElement* video, const IntRect& cropRect)
+ImageBitmap::ImageBitmap(HTMLVideoElement* video, const IntRect& cropRect, Document* document)
 {
     IntSize playerSize;
     if (video->webMediaPlayer())
@@ -64,12 +65,14 @@ ImageBitmap::ImageBitmap(HTMLVideoElement* video, const IntRect& cropRect)
 
     IntPoint dstPoint = IntPoint(std::max(0, -cropRect.x()), std::max(0, -cropRect.y()));
     video->paintCurrentFrame(buffer->canvas(), IntRect(dstPoint, srcRect.size()), nullptr);
-    m_image = StaticBitmapImage::create(buffer->newSkImageSnapshot(PreferNoAcceleration));
+    m_isOriginClean = !video->wouldTaintOrigin(document->securityOrigin());
+    m_image = StaticBitmapImage::create(buffer->newSkImageSnapshot(PreferNoAcceleration), true);
 }
 
 ImageBitmap::ImageBitmap(HTMLCanvasElement* canvas, const IntRect& cropRect)
 {
     ASSERT(canvas->isPaintable());
+    m_isOriginClean = canvas->originClean();
     m_image = cropImage(canvas->copiedImage(BackBuffer, PreferAcceleration).get(), cropRect);
 }
 
@@ -82,7 +85,7 @@ ImageBitmap::ImageBitmap(ImageData* data, const IntRect& cropRect)
         return;
 
     if (srcRect.isEmpty()) {
-        m_image = StaticBitmapImage::create(buffer->newSkImageSnapshot(PreferNoAcceleration));
+        m_image = StaticBitmapImage::create(buffer->newSkImageSnapshot(PreferNoAcceleration), true);
         return;
     }
 
@@ -92,21 +95,24 @@ ImageBitmap::ImageBitmap(ImageData* data, const IntRect& cropRect)
     if (cropRect.y() < 0)
         dstPoint.setY(-cropRect.y());
     buffer->putByteArray(Unmultiplied, data->data()->data(), data->size(), srcRect, dstPoint);
-    m_image = StaticBitmapImage::create(buffer->newSkImageSnapshot(PreferNoAcceleration));
+    m_image = StaticBitmapImage::create(buffer->newSkImageSnapshot(PreferNoAcceleration), true);
 }
 
 ImageBitmap::ImageBitmap(ImageBitmap* bitmap, const IntRect& cropRect)
 {
+    m_isOriginClean = bitmap->originClean();
     m_image = cropImage(bitmap->bitmapImage(), cropRect);
 }
 
 ImageBitmap::ImageBitmap(Image* image, const IntRect& cropRect)
 {
+    m_isOriginClean = image->currentFrameHasSingleSecurityOrigin();
     m_image = cropImage(image, cropRect);
 }
 
 ImageBitmap::ImageBitmap(PassRefPtr<StaticBitmapImage> image)
 {
+    m_isOriginClean = image->currentFrameHasSingleSecurityOrigin();
     m_image = image;
 }
 
@@ -121,16 +127,16 @@ ImageBitmap::~ImageBitmap()
 {
 }
 
-PassRefPtrWillBeRawPtr<ImageBitmap> ImageBitmap::create(HTMLImageElement* image, const IntRect& cropRect)
+PassRefPtrWillBeRawPtr<ImageBitmap> ImageBitmap::create(HTMLImageElement* image, const IntRect& cropRect, Document* document)
 {
     IntRect normalizedCropRect = normalizeRect(cropRect);
-    return adoptRefWillBeNoop(new ImageBitmap(image, normalizedCropRect));
+    return adoptRefWillBeNoop(new ImageBitmap(image, normalizedCropRect, document));
 }
 
-PassRefPtrWillBeRawPtr<ImageBitmap> ImageBitmap::create(HTMLVideoElement* video, const IntRect& cropRect)
+PassRefPtrWillBeRawPtr<ImageBitmap> ImageBitmap::create(HTMLVideoElement* video, const IntRect& cropRect, Document* document)
 {
     IntRect normalizedCropRect = normalizeRect(cropRect);
-    return adoptRefWillBeNoop(new ImageBitmap(video, normalizedCropRect));
+    return adoptRefWillBeNoop(new ImageBitmap(video, normalizedCropRect, document));
 }
 
 PassRefPtrWillBeRawPtr<ImageBitmap> ImageBitmap::create(HTMLCanvasElement* canvas, const IntRect& cropRect)