Index: third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp |
diff --git a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp |
index bb8273c54fa8abfdd2bc0caabca7139c45e94571..3e05787382294ec346a48731860ff383190b63d3 100644 |
--- a/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp |
+++ b/third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp |
@@ -255,11 +255,7 @@ bool HTMLCanvasElement::shouldBeDirectComposited() const |
bool HTMLCanvasElement::isPaintable() const |
{ |
- if (!m_context) |
- return ImageBuffer::canCreateImageBuffer(size()); |
- if (renderingContext()->getImage()) |
- return true; |
- return buffer(); |
+ return (m_context && m_context->isPaintable()) || ImageBuffer::canCreateImageBuffer(size()); |
} |
void HTMLCanvasElement::didDraw(const FloatRect& rect) |
@@ -1112,12 +1108,10 @@ PassRefPtr<Image> HTMLCanvasElement::getSourceImageForCanvas(SourceImageStatus* |
} |
RefPtr<SkImage> skImage; |
- RefPtr<blink::Image> image = renderingContext()->getImage(); |
+ RefPtr<blink::Image> image = renderingContext()->getImage(reason); |
if (image) |
skImage = image->imageForCurrentFrame(); |
- else |
- skImage = hasImageBuffer() ? buffer()->newSkImageSnapshot(hint, reason) : createTransparentImage(size())->imageForCurrentFrame(); |
Justin Novosad
2016/08/31 18:54:23
This code was deleted because getImage() is now im
|
if (skImage) { |
*status = NormalSourceImageStatus; |