Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(164)

Unified Diff: src/effects/SkMatrixImageFilter.cpp

Issue 1011273003: Move SkMatrixImageFilter into core, and add a factory fn for it. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Changed all callers to use SkImageFilter::CreateMatrixFilter() instead of SKMIF::Create() Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkMatrixImageFilter.cpp ('k') | tests/ImageFilterTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/effects/SkMatrixImageFilter.cpp
diff --git a/src/effects/SkMatrixImageFilter.cpp b/src/effects/SkMatrixImageFilter.cpp
deleted file mode 100644
index a61867e041a0fad2447f4aa7f9b1468d7a2f95dd..0000000000000000000000000000000000000000
--- a/src/effects/SkMatrixImageFilter.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright 2014 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 "SkMatrixImageFilter.h"
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkDevice.h"
-#include "SkColorPriv.h"
-#include "SkReadBuffer.h"
-#include "SkWriteBuffer.h"
-#include "SkMatrix.h"
-#include "SkRect.h"
-
-SkMatrixImageFilter::SkMatrixImageFilter(const SkMatrix& transform,
- SkFilterQuality filterQuality,
- SkImageFilter* input)
- : INHERITED(1, &input),
- fTransform(transform),
- fFilterQuality(filterQuality) {
-}
-
-SkMatrixImageFilter* SkMatrixImageFilter::Create(const SkMatrix& transform,
- SkFilterQuality filterQuality,
- SkImageFilter* input) {
- return SkNEW_ARGS(SkMatrixImageFilter, (transform, filterQuality, input));
-}
-
-SkFlattenable* SkMatrixImageFilter::CreateProc(SkReadBuffer& buffer) {
- SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
- SkMatrix matrix;
- buffer.readMatrix(&matrix);
- SkFilterQuality quality = static_cast<SkFilterQuality>(buffer.readInt());
- return Create(matrix, quality, common.getInput(0));
-}
-
-void SkMatrixImageFilter::flatten(SkWriteBuffer& buffer) const {
- this->INHERITED::flatten(buffer);
- buffer.writeMatrix(fTransform);
- buffer.writeInt(fFilterQuality);
-}
-
-SkMatrixImageFilter::~SkMatrixImageFilter() {
-}
-
-bool SkMatrixImageFilter::onFilterImage(Proxy* proxy,
- const SkBitmap& source,
- const Context& ctx,
- SkBitmap* result,
- SkIPoint* offset) const {
- SkBitmap src = source;
- SkIPoint srcOffset = SkIPoint::Make(0, 0);
- if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctx, &src, &srcOffset)) {
- return false;
- }
-
- SkRect dstRect;
- SkIRect srcBounds, dstBounds;
- src.getBounds(&srcBounds);
- srcBounds.offset(srcOffset);
- SkRect srcRect = SkRect::Make(srcBounds);
- SkMatrix matrix;
- if (!ctx.ctm().invert(&matrix)) {
- return false;
- }
- matrix.postConcat(fTransform);
- matrix.postConcat(ctx.ctm());
- matrix.mapRect(&dstRect, srcRect);
- dstRect.roundOut(&dstBounds);
-
- SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(dstBounds.width(), dstBounds.height()));
- if (NULL == device.get()) {
- return false;
- }
-
- SkCanvas canvas(device.get());
- canvas.translate(-SkIntToScalar(dstBounds.x()), -SkIntToScalar(dstBounds.y()));
- canvas.concat(matrix);
- SkPaint paint;
-
- paint.setXfermodeMode(SkXfermode::kSrc_Mode);
- paint.setFilterQuality(fFilterQuality);
- canvas.drawBitmap(src, srcRect.x(), srcRect.y(), &paint);
-
- *result = device.get()->accessBitmap(false);
- offset->fX = dstBounds.fLeft;
- offset->fY = dstBounds.fTop;
- return true;
-}
-
-void SkMatrixImageFilter::computeFastBounds(const SkRect& src, SkRect* dst) const {
- SkRect bounds = src;
- if (getInput(0)) {
- getInput(0)->computeFastBounds(src, &bounds);
- }
- fTransform.mapRect(dst, bounds);
- dst->join(bounds); // Work around for skia:3194
-}
-
-bool SkMatrixImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
- SkIRect* dst) const {
- SkMatrix transformInverse;
- if (!fTransform.invert(&transformInverse)) {
- return false;
- }
- SkMatrix matrix;
- if (!ctm.invert(&matrix)) {
- return false;
- }
- matrix.postConcat(transformInverse);
- matrix.postConcat(ctm);
- SkRect floatBounds;
- matrix.mapRect(&floatBounds, SkRect::Make(src));
- SkIRect bounds = floatBounds.roundOut();
- if (getInput(0) && !getInput(0)->filterBounds(bounds, ctm, &bounds)) {
- return false;
- }
-
- *dst = bounds;
- return true;
-}
-
-#ifndef SK_IGNORE_TO_STRING
-void SkMatrixImageFilter::toString(SkString* str) const {
- str->appendf("SkMatrixImageFilter: (");
-
- str->appendf("transform: (%f %f %f %f %f %f %f %f %f)",
- fTransform[SkMatrix::kMScaleX],
- fTransform[SkMatrix::kMSkewX],
- fTransform[SkMatrix::kMTransX],
- fTransform[SkMatrix::kMSkewY],
- fTransform[SkMatrix::kMScaleY],
- fTransform[SkMatrix::kMTransY],
- fTransform[SkMatrix::kMPersp0],
- fTransform[SkMatrix::kMPersp1],
- fTransform[SkMatrix::kMPersp2]);
-
- str->append("<dt>FilterLevel:</dt><dd>");
- static const char* gFilterLevelStrings[] = { "None", "Low", "Medium", "High" };
- str->append(gFilterLevelStrings[fFilterQuality]);
- str->append("</dd>");
-
- str->appendf(")");
-}
-#endif
« no previous file with comments | « src/core/SkMatrixImageFilter.cpp ('k') | tests/ImageFilterTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698