Moving 4 SkImageFilter derived classes from blink to skia
There were 4 classes in blink that derived from SkImageFilter :
- TileImageFilter -> SkTileImageFilter
- OffsetImageFilter -> SkOffsetImageFilter (already existed)
- FloodImageFilter -> SkFloodImageFilter
- CompositeImageFilter -> SkCompositeImageFilter
All functions were copied as is, without modification (except for warnings fixes), except for the offset filter, which was merged into the existing SkOffsetImageFilter class, as a special case when a crop rect is provided. Since the names won't clash with the names in blink, it should be easy to integrate them in blink later and fix issues, if needed.
BUG=
R=senorblanco@google.com, senorblanco@chromium.org, bsalomon@google.com, reed@google.com, mtklein@google.com
Author: sugoi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/24157005
git-svn-id: http://skia.googlecode.com/svn/trunk@11475 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/effects/SkOffsetImageFilter.cpp b/src/effects/SkOffsetImageFilter.cpp
index ad5e49d..3b98160 100644
--- a/src/effects/SkOffsetImageFilter.cpp
+++ b/src/effects/SkOffsetImageFilter.cpp
@@ -7,24 +7,51 @@
#include "SkOffsetImageFilter.h"
#include "SkBitmap.h"
-#include "SkMatrix.h"
+#include "SkCanvas.h"
+#include "SkDevice.h"
#include "SkFlattenableBuffers.h"
+#include "SkMatrix.h"
+#include "SkPaint.h"
bool SkOffsetImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& source,
const SkMatrix& matrix,
SkBitmap* result,
SkIPoint* loc) {
+ SkImageFilter* input = getInput(0);
SkBitmap src = source;
- if (getInput(0) && !getInput(0)->filterImage(proxy, source, matrix, &src, loc)) {
- return false;
+ if (cropRect().isLargest()) {
+ if (input && !input->filterImage(proxy, source, matrix, &src, loc)) {
+ return false;
+ }
+
+ SkVector vec;
+ matrix.mapVectors(&vec, &fOffset, 1);
+
+ loc->fX += SkScalarRoundToInt(vec.fX);
+ loc->fY += SkScalarRoundToInt(vec.fY);
+ *result = src;
+ } else {
+ SkIPoint srcOffset = SkIPoint::Make(0, 0);
+ if (input && !input->filterImage(proxy, source, matrix, &src, &srcOffset)) {
+ return false;
+ }
+
+ SkIRect bounds;
+ src.getBounds(&bounds);
+
+ if (!applyCropRect(&bounds, matrix)) {
+ return false;
+ }
+
+ SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
+ SkCanvas canvas(device);
+ SkPaint paint;
+ paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+ canvas.drawBitmap(src, fOffset.fX - bounds.left(), fOffset.fY - bounds.top(), &paint);
+ *result = device->accessBitmap(false);
+ loc->fX += bounds.left();
+ loc->fY += bounds.top();
}
-
- SkVector vec;
- matrix.mapVectors(&vec, &fOffset, 1);
-
- loc->fX += SkScalarRoundToInt(vec.fX);
- loc->fY += SkScalarRoundToInt(vec.fY);
- *result = src;
return true;
}
@@ -43,8 +70,8 @@
buffer.writePoint(fOffset);
}
-SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy,
- SkImageFilter* input) : INHERITED(input) {
+SkOffsetImageFilter::SkOffsetImageFilter(SkScalar dx, SkScalar dy, SkImageFilter* input,
+ const SkIRect* cropRect) : INHERITED(input, cropRect) {
fOffset.set(dx, dy);
}
diff --git a/src/effects/SkTileImageFilter.cpp b/src/effects/SkTileImageFilter.cpp
new file mode 100644
index 0000000..f2c586d
--- /dev/null
+++ b/src/effects/SkTileImageFilter.cpp
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "SkTileImageFilter.h"
+#include "SkBitmap.h"
+#include "SkCanvas.h"
+#include "SkDevice.h"
+#include "SkFlattenableBuffers.h"
+#include "SkMatrix.h"
+#include "SkPaint.h"
+#include "SkShader.h"
+
+bool SkTileImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src, const SkMatrix& ctm,
+ SkBitmap* dst, SkIPoint* offset) {
+ SkBitmap source = src;
+ SkImageFilter* input = getInput(0);
+ SkIPoint localOffset = SkIPoint::Make(0, 0);
+ if (input && !input->filterImage(proxy, src, ctm, &source, &localOffset)) {
+ return false;
+ }
+
+ int w = SkScalarTruncToInt(fDstRect.width());
+ int h = SkScalarTruncToInt(fDstRect.height());
+ if (!fSrcRect.width() || !fSrcRect.height() || !w || !h) {
+ return false;
+ }
+
+ SkIRect srcRect;
+ fSrcRect.roundOut(&srcRect);
+ SkBitmap subset;
+ if (!source.extractSubset(&subset, srcRect)) {
+ return false;
+ }
+
+ SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(w, h));
+ SkIRect bounds;
+ source.getBounds(&bounds);
+ SkCanvas canvas(device);
+ SkPaint paint;
+ paint.setXfermodeMode(SkXfermode::kSrc_Mode);
+
+ SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(subset,
+ SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode));
+ paint.setShader(shader);
+ SkRect dstRect = fDstRect;
+ dstRect.offset(SkIntToScalar(localOffset.fX), SkIntToScalar(localOffset.fY));
+ canvas.drawRect(dstRect, paint);
+ *dst = device->accessBitmap(false);
+ return true;
+}
+
+SkTileImageFilter::SkTileImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {
+ buffer.readRect(&fSrcRect);
+ buffer.readRect(&fDstRect);
+}
+
+void SkTileImageFilter::flatten(SkFlattenableWriteBuffer& buffer) const {
+ this->INHERITED::flatten(buffer);
+ buffer.writeRect(fSrcRect);
+ buffer.writeRect(fDstRect);
+}
+
diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp
index 898bad1..8491292 100644
--- a/src/effects/SkXfermodeImageFilter.cpp
+++ b/src/effects/SkXfermodeImageFilter.cpp
@@ -7,6 +7,7 @@
#include "SkXfermodeImageFilter.h"
#include "SkCanvas.h"
+#include "SkDevice.h"
#include "SkColorPriv.h"
#include "SkFlattenableBuffers.h"
#include "SkXfermode.h"
@@ -21,8 +22,9 @@
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);
}
@@ -58,19 +60,29 @@
!foregroundInput->filterImage(proxy, src, ctm, &foreground, &foregroundOffset)) {
return false;
}
- dst->setConfig(background.config(), background.width(), background.height());
- dst->allocPixels();
- SkCanvas canvas(*dst);
+
+ 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, 0, 0, &paint);
+ canvas.drawBitmap(background, SkIntToScalar(backgroundOffset.fX),
+ SkIntToScalar(backgroundOffset.fY), &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;
+ canvas.drawBitmap(foreground, SkIntToScalar(foregroundOffset.fX),
+ SkIntToScalar(foregroundOffset.fY), &paint);
+ *dst = device->accessBitmap(false);
+ offset->fX += bounds.left();
+ offset->fY += bounds.top();
return true;
}