Revert of Switch SkColorFilterImageFilter over to new onFilterImage interface

src/effects/SkColorFilterImageFilter.cpp

 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorFilterImageFilter.h"
-
+#include "SkBitmap.h"
 #include "SkCanvas.h"
+#include "SkColorMatrixFilter.h"
+#include "SkDevice.h"
 #include "SkColorFilter.h"
 #include "SkReadBuffer.h"
-#include "SkSpecialImage.h"
-#include "SkSpecialSurface.h"
+#include "SkTableColorFilter.h"
 #include "SkWriteBuffer.h"
 
 SkImageFilter* SkColorFilterImageFilter::Create(SkColorFilter* cf, SkImageFilter* input,
                                                 const CropRect* cropRect) {
-    if (!cf) {
+    if (nullptr == cf) {
         return nullptr;
     }
 
     SkColorFilter* inputCF;
     if (input && input->isColorFilterNode(&inputCF)) {
         // This is an optimization, as it collapses the hierarchy by just combining the two
         // colorfilters into a single one, which the new imagefilter will wrap.
         sk_sp<SkColorFilter> newCF(SkColorFilter::MakeComposeFilter(sk_ref_sp(cf),
                                                                     sk_sp<SkColorFilter>(inputCF)));
         if (newCF) {
             return new SkColorFilterImageFilter(newCF.get(), input->getInput(0), cropRect);
         }
     }
 
     return new SkColorFilterImageFilter(cf, input, cropRect);
 }
 
 SkColorFilterImageFilter::SkColorFilterImageFilter(SkColorFilter* cf,
-                                                   SkImageFilter* input, 
-                                                   const CropRect* cropRect)
-    : INHERITED(1, &input, cropRect)
-    , fColorFilter(SkRef(cf)) {
+        SkImageFilter* input, const CropRect* cropRect)
+    : INHERITED(1, &input, cropRect), fColorFilter(SkRef(cf)) {
 }
 
 SkFlattenable* SkColorFilterImageFilter::CreateProc(SkReadBuffer& buffer) {
     SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
     sk_sp<SkColorFilter> cf(buffer.readColorFilter());
     return Create(cf.get(), common.getInput(0), &common.cropRect());
 }
 
 void SkColorFilterImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writeFlattenable(fColorFilter.get());
 }
 
-SkSpecialImage* SkColorFilterImageFilter::onFilterImage(SkSpecialImage* source, const Context& ctx,
-                                                        SkIPoint* offset) const {
-    SkIPoint inputOffset = SkIPoint::Make(0, 0);
-    SkAutoTUnref<SkSpecialImage> input(this->filterInput(0, source, ctx, &inputOffset));
-    if (!input) {
-        return nullptr;
+bool SkColorFilterImageFilter::onFilterImageDeprecated(Proxy* proxy, const SkBitmap& source,
+                                                       const Context& ctx,
+                                                       SkBitmap* result,
+                                                       SkIPoint* offset) const {
+    SkBitmap src = source;
+    SkIPoint srcOffset = SkIPoint::Make(0, 0);
+    if (!this->filterInputDeprecated(0, proxy, source, ctx, &src, &srcOffset)) {
+        return false;
     }
 
     SkIRect bounds;
-    const SkIRect inputBounds = SkIRect::MakeXYWH(inputOffset.fX, inputOffset.fY,
-                                                  input->width(), input->height());
-    if (!this->applyCropRect(ctx, inputBounds, &bounds)) {
-        return nullptr;
+    SkIRect srcBounds = src.bounds();
+    srcBounds.offset(srcOffset);
+    if (!this->applyCropRect(ctx, srcBounds, &bounds)) {
+        return false;
     }
 
-    SkImageInfo info = SkImageInfo::MakeN32(bounds.width(), bounds.height(), kPremul_SkAlphaType);
-    sk_sp<SkSpecialSurface> surf(source->makeSurface(info));
-    if (!surf) {
-        return nullptr;
+    SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
+    if (nullptr == device.get()) {
+        return false;
     }
-
-    SkCanvas* canvas = surf->getCanvas();
-    SkASSERT(canvas);
-
-    // TODO: it seems like this clear shouldn't be necessary (see skbug.com/5075)
-    canvas->clear(0x0);
-
+    SkCanvas canvas(device.get());
     SkPaint paint;
 
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     paint.setColorFilter(fColorFilter);
+    canvas.drawBitmap(src, SkIntToScalar(srcOffset.fX - bounds.fLeft),
+                           SkIntToScalar(srcOffset.fY - bounds.fTop), &paint);
 
-    input->draw(canvas,
-                SkIntToScalar(inputOffset.fX - bounds.fLeft),
-                SkIntToScalar(inputOffset.fY - bounds.fTop),
-                &paint);
-
+    *result = device.get()->accessBitmap(false);
     offset->fX = bounds.fLeft;
     offset->fY = bounds.fTop;
-    return surf->makeImageSnapshot().release();
+    return true;
 }
 
 bool SkColorFilterImageFilter::onIsColorFilterNode(SkColorFilter** filter) const {
     SkASSERT(1 == this->countInputs());
     if (!this->cropRectIsSet()) {
         if (filter) {
             *filter = SkRef(fColorFilter.get());
         }
         return true;
     }
@@ skipping 16 matching lines @@
     if (this->getInput(0)) {
         this->getInput(0)->toString(str);
     }
 
     str->appendf(") color filter: ");
     fColorFilter->toString(str);
 
     str->append(")");
 }
 #endif