Adds filter support for offscreen canvas

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 32 matching lines @@
 DEFINE_TRACE(OffscreenCanvasRenderingContext2D) {
   CanvasRenderingContext::trace(visitor);
   BaseRenderingContext2D::trace(visitor);
 }
 
 void OffscreenCanvasRenderingContext2D::commit(ExceptionState& exceptionState) {
   if (getOffscreenCanvas()->getAssociatedCanvasId() < 0) {
     // If an OffscreenCanvas has no associated canvas Id, it indicates that
     // it is not an OffscreenCanvas created by transfering control from html
     // canvas.
-    exceptionState.throwDOMException(InvalidStateError,
-                                     "Commit() was called on a context whose "
-                                     "OffscreenCanvas is not associated with a "
-                                     "canvas element.");
+    exceptionState.throwDOMException(
+        InvalidStateError,
+        "Commit() was called on a context whose OffscreenCanvas is not "
+        "associated with a canvas element.");
     return;
   }
   double commitStartTime = WTF::monotonicallyIncreasingTime();
   RefPtr<StaticBitmapImage> image = this->transferToStaticBitmapImage();
   getOffscreenCanvas()->getOrCreateFrameDispatcher()->dispatchFrame(
       std::move(image), commitStartTime);
 }
 
 // BaseRenderingContext2D implementation
 bool OffscreenCanvasRenderingContext2D::originClean() const {
   return getOffscreenCanvas()->originClean();
 }
 
 void OffscreenCanvasRenderingContext2D::setOriginTainted() {
   return getOffscreenCanvas()->setOriginTainted();
 }
 
 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());
   }
 
   return CanvasRenderingContext::wouldTaintOrigin(
       source, executionContext->getSecurityOrigin());
 }
 
 int OffscreenCanvasRenderingContext2D::width() const {
   return getOffscreenCanvas()->width();
 }
@@ skipping 96 matching lines @@
 
 AffineTransform OffscreenCanvasRenderingContext2D::baseTransform() const {
   if (!m_imageBuffer)
     return AffineTransform();  // identity
   return m_imageBuffer->baseTransform();
 }
 
 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().hasFilterWithoutDocument(getOffscreenCanvas()->size());
 }
 
 SkImageFilter* OffscreenCanvasRenderingContext2D::stateGetFilter() {
-  // TODO: make getFilter accept nullptr
-  // return state().getFilter(nullptr, nullptr, IntSize(width(), height()),
-  // this);
-  return nullptr;
+  SkImageFilter* f =
+      state().getFilterWithoutDocument(getOffscreenCanvas()->size());
+  return f;

[meade_UTC10, 2016/10/26 06:57:34]

Nit: This could just be

return state().getFilterWithoutDocument(getOffscreenCanvas()->size());

[fserb, 2016/10/26 19:08:26]

done.

+}
+
+void OffscreenCanvasRenderingContext2D::setFilter(const String& filterString) {
+  BaseRenderingContext2D::setFilter(filterString);
 }
 
 void OffscreenCanvasRenderingContext2D::validateStateStack() const {
 #if DCHECK_IS_ON()
   if (SkCanvas* skCanvas = existingDrawingCanvas()) {
     DCHECK_EQ(static_cast<size_t>(skCanvas->getSaveCount()),
               m_stateStack.size() + 1);
   }
 #endif
 }
 
 bool OffscreenCanvasRenderingContext2D::isContextLost() const {
   return false;
 }
 
 bool OffscreenCanvasRenderingContext2D::isPaintable() const {
   return this->imageBuffer();
 }
 }