Moving 4 SkImageFilter derived classes from blink to skia

src/effects/SkXfermodeImageFilter.cpp

 /*
  * Copyright 2013 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 "SkXfermodeImageFilter.h"
 #include "SkCanvas.h"
+#include "SkDevice.h"
 #include "SkColorPriv.h"
 #include "SkFlattenableBuffers.h"
 #include "SkXfermode.h"
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "effects/GrSimpleTextureEffect.h"
 #include "SkGr.h"
 #include "SkImageFilterUtils.h"
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkXfermodeImageFilter::SkXfermodeImageFilter(SkXfermode* mode,
                                              SkImageFilter* background,
-                                             SkImageFilter* foreground)
-  : INHERITED(background, foreground), fMode(mode) {
+                                             SkImageFilter* foreground,
+                                             const SkIRect* cropRect)
+  : INHERITED(background, foreground, cropRect), fMode(mode) {
     SkSafeRef(fMode);
 }
 
 SkXfermodeImageFilter::~SkXfermodeImageFilter() {
     SkSafeUnref(fMode);
 }
 
 SkXfermodeImageFilter::SkXfermodeImageFilter(SkFlattenableReadBuffer& buffer)
   : INHERITED(buffer) {
     fMode = buffer.readFlattenableT<SkXfermode>();
@@ skipping 15 matching lines @@
     SkIPoint backgroundOffset = SkIPoint::Make(0, 0);
     if (backgroundInput &&
         !backgroundInput->filterImage(proxy, src, ctm, &background, &backgroundOffset)) {
         return false;
     }
     SkIPoint foregroundOffset = SkIPoint::Make(0, 0);
     if (foregroundInput &&
         !foregroundInput->filterImage(proxy, src, ctm, &foreground, &foregroundOffset)) {
         return false;
     }
-    dst->setConfig(background.config(), background.width(), background.height());
-    dst->allocPixels();
-    SkCanvas canvas(*dst);
-    SkPaint paint;
-    paint.setXfermodeMode(SkXfermode::kSrc_Mode);
-    canvas.drawBitmap(background, 0, 0, &paint);
-    paint.setXfermode(fMode);
-    canvas.drawBitmap(foreground,
-                      SkIntToScalar(foregroundOffset.fX - backgroundOffset.fX),
-                      SkIntToScalar(foregroundOffset.fY - backgroundOffset.fY),
-                      &paint);
-    offset->fX += backgroundOffset.fX;
-    offset->fY += backgroundOffset.fY;
+
+    if (cropRect().isLargest()) {

[Stephen White, 2013/09/24 23:14:13]

I think the code you've added below should work for both crop-rect and
non-crop-rect cases (tests should tell you). You should be able to delete the
first stanza of code here.

[sugoi1, 2013/09/25 15:41:08]

Done.

+        dst->setConfig(background.config(), background.width(), background.height());
+        dst->allocPixels();
+        SkCanvas canvas(*dst);
+        SkPaint paint;
+        paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+        canvas.drawBitmap(background, 0, 0, &paint);
+        paint.setXfermode(fMode);
+        canvas.drawBitmap(foreground,
+                          SkIntToScalar(foregroundOffset.fX - backgroundOffset.fX),
+                          SkIntToScalar(foregroundOffset.fY - backgroundOffset.fY),
+                          &paint);
+        offset->fX += backgroundOffset.fX;
+        offset->fY += backgroundOffset.fY;
+    } else {
+        SkIRect bounds;
+        background.getBounds(&bounds);
+        if (!applyCropRect(&bounds, ctm)) {
+            return false;
+        }
+        backgroundOffset.fX -= bounds.left();
+        backgroundOffset.fY -= bounds.top();
+        foregroundOffset.fX -= bounds.left();
+        foregroundOffset.fY -= bounds.top();
+
+        SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
+        SkCanvas canvas(device);
+        SkPaint paint;
+        paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+        canvas.drawBitmap(background, SkIntToScalar(backgroundOffset.fX),
+                          SkIntToScalar(backgroundOffset.fY), &paint);
+        paint.setXfermode(fMode);
+        canvas.drawBitmap(foreground, SkIntToScalar(foregroundOffset.fX),
+                          SkIntToScalar(foregroundOffset.fY), &paint);
+        *dst = device->accessBitmap(false);
+        offset->fX += bounds.left();
+        offset->fY += bounds.top();
+    }
     return true;
 }
 
 #if SK_SUPPORT_GPU
 
 bool SkXfermodeImageFilter::filterImageGPU(Proxy* proxy,
                                            const SkBitmap& src,
                                            const SkMatrix& ctm,
                                            SkBitmap* result,
                                            SkIPoint* offset) {
@@ skipping 53 matching lines @@
         foregroundPaint.setBlendFunc(sk_blend_to_grblend(sm), sk_blend_to_grblend(dm));
         foregroundPaint.addColorTextureEffect(foregroundTex, foregroundMatrix);
         context->drawRect(foregroundPaint, srcRect);
     }
     offset->fX += backgroundOffset.fX;
     offset->fY += backgroundOffset.fY;
     return SkImageFilterUtils::WrapTexture(dst, src.width(), src.height(), result);
 }
 
 #endif