Chromium Code Reviews| 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..4174079a26abf4aa6b916de2eabe2a59e0684e7a 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,15 @@ 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::setFilter(const String& filterString) { |
| + BaseRenderingContext2D::setFilter(filterString); |
|
Justin Novosad
2017/01/17 22:49:02
Ah, here it is. Why is this needed? It should not
fserb
2017/01/18 15:47:59
yep. Sorry, it was a side effect from the process.
|
| } |
| void OffscreenCanvasRenderingContext2D::validateStateStack() const { |