Commit 01f7d1b3 authored by piotaixr@chromium.org's avatar piotaixr@chromium.org

Returns nullptr in getImageSourceForCanvas when imageSnapshot is null

BUG=421033

Review URL: https://codereview.chromium.org/633093002

git-svn-id: svn://svn.chromium.org/blink/trunk@183554 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent d00b05e9
...@@ -738,11 +738,19 @@ PassRefPtr<Image> HTMLCanvasElement::getSourceImageForCanvas(SourceImageMode mod ...@@ -738,11 +738,19 @@ PassRefPtr<Image> HTMLCanvasElement::getSourceImageForCanvas(SourceImageMode mod
// can't create SkImage from WebGLImageBufferSurface (contains only SkBitmap) // can't create SkImage from WebGLImageBufferSurface (contains only SkBitmap)
return m_imageBuffer->copyImage(DontCopyBackingStore, Unscaled); return m_imageBuffer->copyImage(DontCopyBackingStore, Unscaled);
} else { }
RefPtr<SkImage> image = m_imageBuffer->newImageSnapshot();
if (image) {
*status = NormalSourceImageStatus; *status = NormalSourceImageStatus;
return StaticBitmapImage::create(image.release());
} }
return StaticBitmapImage::create(m_imageBuffer->newImageSnapshot());
*status = InvalidSourceImageStatus;
return nullptr;
} }
bool HTMLCanvasElement::wouldTaintOrigin(SecurityOrigin*) const bool HTMLCanvasElement::wouldTaintOrigin(SecurityOrigin*) const
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment