| Index: third_party/WebKit/Source/modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.cpp
|
| diff --git a/third_party/WebKit/Source/modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.cpp b/third_party/WebKit/Source/modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.cpp
|
| index 758318b868cfc03fdff88fcf6e793f1ef12ac287..4e3e34798d9e241b7762626197e7de7998410a71 100644
|
| --- a/third_party/WebKit/Source/modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.cpp
|
| +++ b/third_party/WebKit/Source/modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.cpp
|
| @@ -33,17 +33,18 @@ DEFINE_TRACE(OffscreenCanvasRenderingContext2D)
|
| // BaseRenderingContext2D implementation
|
| bool OffscreenCanvasRenderingContext2D::originClean() const
|
| {
|
| - return m_originClean;
|
| + return getOffscreenCanvas()->originClean();
|
| }
|
|
|
| void OffscreenCanvasRenderingContext2D::setOriginTainted()
|
| {
|
| - m_originClean = false;
|
| + return getOffscreenCanvas()->setOriginTainted();
|
| }
|
|
|
| -bool OffscreenCanvasRenderingContext2D::wouldTaintOrigin(CanvasImageSource* source, ScriptState* scriptState)
|
| +bool OffscreenCanvasRenderingContext2D::wouldTaintOrigin(CanvasImageSource* source)
|
| {
|
| - if (scriptState->getExecutionContext()->isWorkerGlobalScope()) {
|
| + ASSERT(getOffscreenCanvas());
|
| + if (getOffscreenCanvas()->getExecutionContext()->isWorkerGlobalScope()) {
|
| // Currently, we only support passing in ImageBitmap as source image in
|
| // drawImage() or createPattern() in a OffscreenCanvas2d in worker.
|
| ASSERT(source->isImageBitmap());
|
| @@ -91,6 +92,7 @@ ImageBitmap* OffscreenCanvasRenderingContext2D::transferToImageBitmap(ExceptionS
|
| // TODO: crbug.com/593514 Add support for GPU rendering
|
| RefPtr<SkImage> skImage = m_imageBuffer->newSkImageSnapshot(PreferNoAcceleration, SnapshotReasonUnknown);
|
| RefPtr<StaticBitmapImage> image = StaticBitmapImage::create(skImage.release());
|
| + image->setOriginClean(this->originClean());
|
| m_imageBuffer.clear(); // "Transfer" means no retained buffer
|
| return ImageBitmap::create(image.release());
|
| }
|
|
|