Make OffscreenCanvas a member of CanvasImageSource

third_party/WebKit/Source/core/html/HTMLCanvasElement.cpp

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 d3db49bf4c1502d785f667376e39c571973f2e34..31df25a909634d621b1d259489bb2b2ba8a07058 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 (m_context->getContextType() == CanvasRenderingContext::ContextImageBitmap)
-        return (renderingContext()->getImage().get());
-    return buffer();
+    return (m_context && m_context->isPaintable()) || ImageBuffer::canCreateImageBuffer(size());
 }
 
 void HTMLCanvasElement::didDraw(const FloatRect& rect)
@@ -1124,12 +1120,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();
 
     if (skImage) {
         *status = NormalSourceImageStatus;