Make OffscreenCanvas a member of CanvasImageSource

third_party/WebKit/Source/modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.h"
 
 #include "bindings/modules/v8/OffscreenCanvasRenderingContext2DOrWebGLRenderingContextOrWebGL2RenderingContext.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/frame/Settings.h"
 #include "core/workers/WorkerGlobalScope.h"
@@ skipping 40 matching lines @@
 }
 
 void OffscreenCanvasRenderingContext2D::setOriginTainted()
 {
     return getOffscreenCanvas()->setOriginTainted();
 }
 
 bool OffscreenCanvasRenderingContext2D::wouldTaintOrigin(CanvasImageSource* source, ExecutionContext* executionContext)
 {
     if (executionContext->isWorkerGlobalScope()) {
-        // Currently, we only support passing in ImageBitmap as source image in
-        // drawImage() or createPattern() in a OffscreenCanvas2d in worker.
-        ASSERT(source->isImageBitmap());
+        // We only support passing in ImageBitmap and OffscreenCanvases as source images
+        // in drawImage() or createPattern() in a OffscreenCanvas2d in worker.
+        DCHECK(source->isImageBitmap() || source->isOffscreenCanvas());
     }
 
     return CanvasRenderingContext::wouldTaintOrigin(source, executionContext->getSecurityOrigin());
 }
 
 int OffscreenCanvasRenderingContext2D::width() const
 {
     return getOffscreenCanvas()->width();
 }
 
@@ skipping 46 matching lines @@
         return nullptr;
     RefPtr<SkImage> skImage = m_imageBuffer->newSkImageSnapshot(PreferAcceleration, SnapshotReasonTransferToImageBitmap);
     DCHECK(isMainThread() || !skImage->isTextureBacked()); // Acceleration not yet supported in Workers
     RefPtr<StaticBitmapImage> image = StaticBitmapImage::create(skImage.release());
     image->setOriginClean(this->originClean());
     m_imageBuffer.reset(); // "Transfer" means no retained buffer
     m_needsMatrixClipRestore = true;
     return ImageBitmap::create(image.release());
 }
 
+PassRefPtr<Image> OffscreenCanvasRenderingContext2D::getImage(SnapshotReason reason) const
+{
+    if (!imageBuffer())
+        return nullptr;
+    RefPtr<SkImage> skImage = m_imageBuffer->newSkImageSnapshot(PreferAcceleration, reason);
+    RefPtr<StaticBitmapImage> image = StaticBitmapImage::create(skImage.release());
+    return image;
+}
+
 void OffscreenCanvasRenderingContext2D::setOffscreenCanvasGetContextResult(OffscreenRenderingContext& result)
 {
     result.setOffscreenCanvasRenderingContext2D(this);
 }
 
 bool OffscreenCanvasRenderingContext2D::parseColorOrCurrentColor(Color& color, const String& colorString) const
 {
     return ::blink::parseColorOrCurrentColor(color, colorString, nullptr);
 }
 
@@ skipping 52 matching lines @@
 bool OffscreenCanvasRenderingContext2D::isContextLost() const
 {
     return false;
 }
 
 bool OffscreenCanvasRenderingContext2D::isPaintable() const
 {
     return this->imageBuffer();
 }
 }