| 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 1ae9597b25518839c3d547bf5d7b2c30468d5f2a..6d343468ad498deb3e80616a4c651063bcf52981 100644
|
| --- a/third_party/WebKit/Source/modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.cpp
|
| +++ b/third_party/WebKit/Source/modules/offscreencanvas2d/OffscreenCanvasRenderingContext2D.cpp
|
| @@ -77,9 +77,9 @@ bool OffscreenCanvasRenderingContext2D::wouldTaintOrigin(
|
| CanvasImageSource* source,
|
| ExecutionContext* executionContext) {
|
| if (executionContext->isWorkerGlobalScope()) {
|
| - // We only support passing in ImageBitmap and OffscreenCanvases as source
|
| - // images in drawImage() or createPattern() in a OffscreenCanvas2d in
|
| - // worker.
|
| + // 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());
|
| }
|
|
|
| @@ -227,17 +227,11 @@ AffineTransform OffscreenCanvasRenderingContext2D::baseTransform() const {
|
| void OffscreenCanvasRenderingContext2D::didDraw(const SkIRect& dirtyRect) {}
|
|
|
| bool OffscreenCanvasRenderingContext2D::stateHasFilter() {
|
| - // TODO: crbug.com/593838 make hasFilter accept nullptr
|
| - // return state().hasFilter(nullptr, nullptr, IntSize(width(), height()),
|
| - // this);
|
| - return false;
|
| + return state().hasFilterForOffscreenCanvas(offscreenCanvas()->size());
|
| }
|
|
|
| sk_sp<SkImageFilter> OffscreenCanvasRenderingContext2D::stateGetFilter() {
|
| - // TODO: make getFilter accept nullptr
|
| - // return state().getFilter(nullptr, nullptr, IntSize(width(), height()),
|
| - // this);
|
| - return nullptr;
|
| + return state().getFilterForOffscreenCanvas(offscreenCanvas()->size());
|
| }
|
|
|
| void OffscreenCanvasRenderingContext2D::validateStateStack() const {
|
|
|