aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/effects
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2016-04-01 08:09:44 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-04-01 08:09:44 -0700
commit4eb4964e1802d6f222c47e9158636e1ae80bb4b7 (patch)
tree50abc321286d10a8842e8fa48dc9fe5738d4a50a /src/effects
parent7c62b47800bc145369504feb3e127a70724655d4 (diff)
Revert of Switch SkDownSampleImageFilter over to new onFilterImage interface (patchset #2 id:20001 of https://codereview.chromium.org/1851583002/ )
Reason for revert: Some images are incorrect Original issue's description: > Switch SkDownSampleImageFilter over to new onFilterImage interface > > This will slightly change the testimagefilters GM images > > TBR=reed@google.com > > BUG=skia: > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1851583002 > > Committed: https://skia.googlesource.com/skia/+/daa9da4937b6dfc9e1047239b4afd41b1c5474d5 TBR=senorblanco@chromium.org,reed@google.com,senorblanco@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1853823002
Diffstat (limited to 'src/effects')
-rwxr-xr-xsrc/effects/SkTestImageFilters.cpp75
1 files changed, 39 insertions, 36 deletions
diff --git a/src/effects/SkTestImageFilters.cpp b/src/effects/SkTestImageFilters.cpp
index e0afc47df3..a77f5190ff 100755
--- a/src/effects/SkTestImageFilters.cpp
+++ b/src/effects/SkTestImageFilters.cpp
@@ -7,22 +7,36 @@
#include "SkTestImageFilters.h"
#include "SkCanvas.h"
+#include "SkDevice.h"
#include "SkReadBuffer.h"
-#include "SkSpecialImage.h"
-#include "SkSpecialSurface.h"
#include "SkWriteBuffer.h"
+// Simple helper canvas that "takes ownership" of the provided device, so that
+// when this canvas goes out of scope, so will its device. Could be replaced
+// with the following:
+//
+// SkCanvas canvas(device);
+// SkAutoTUnref<SkBaseDevice> aur(device);
+//
+class OwnDeviceCanvas : public SkCanvas {
+public:
+ OwnDeviceCanvas(SkBaseDevice* device) : SkCanvas(device) {
+ SkSafeUnref(device);
+ }
+};
+
///////////////////////////////////////////////////////////////////////////////
-sk_sp<SkSpecialImage> SkDownSampleImageFilter::onFilterImage(SkSpecialImage* source,
- const Context& ctx,
- SkIPoint* offset) const {
- if (fScale > SK_Scalar1 || fScale <= 0) {
- return nullptr;
+bool SkDownSampleImageFilter::onFilterImageDeprecated(Proxy* proxy, const SkBitmap& src,
+ const Context&,
+ SkBitmap* result, SkIPoint*) const {
+ SkScalar scale = fScale;
+ if (scale > SK_Scalar1 || scale <= 0) {
+ return false;
}
- int dstW = SkScalarRoundToInt(source->width() * fScale);
- int dstH = SkScalarRoundToInt(source->height() * fScale);
+ int dstW = SkScalarRoundToInt(src.width() * scale);
+ int dstH = SkScalarRoundToInt(src.height() * scale);
if (dstW < 1) {
dstW = 1;
}
@@ -30,46 +44,35 @@ sk_sp<SkSpecialImage> SkDownSampleImageFilter::onFilterImage(SkSpecialImage* sou
dstH = 1;
}
- sk_sp<SkSpecialImage> tmp;
+ SkBitmap tmp;
// downsample
{
- const SkImageInfo info = SkImageInfo::MakeN32Premul(dstW, dstH);
-
- sk_sp<SkSpecialSurface> surf(source->makeSurface(info));
- if (!surf) {
- return nullptr;
+ SkBaseDevice* dev = proxy->createDevice(dstW, dstH);
+ if (nullptr == dev) {
+ return false;
}
-
- SkCanvas* canvas = surf->getCanvas();
- SkASSERT(canvas);
-
+ OwnDeviceCanvas canvas(dev);
SkPaint paint;
- paint.setFilterQuality(kLow_SkFilterQuality);
- canvas->scale(fScale, fScale);
- source->draw(canvas, 0, 0, &paint);
-
- tmp = surf->makeImageSnapshot();
+ paint.setFilterQuality(kLow_SkFilterQuality);
+ canvas.scale(scale, scale);
+ canvas.drawBitmap(src, 0, 0, &paint);
+ tmp = dev->accessBitmap(false);
}
// upscale
{
- const SkImageInfo info = SkImageInfo::MakeN32Premul(source->width(), source->height());
-
- sk_sp<SkSpecialSurface> surf(source->makeSurface(info));
- if (!surf) {
- return nullptr;
+ SkBaseDevice* dev = proxy->createDevice(src.width(), src.height());
+ if (nullptr == dev) {
+ return false;
}
+ OwnDeviceCanvas canvas(dev);
- SkCanvas* canvas = surf->getCanvas();
- SkASSERT(canvas);
-
- canvas->scale(SkScalarInvert(fScale), SkScalarInvert(fScale));
- tmp->draw(canvas, 0, 0, nullptr);
-
- return surf->makeImageSnapshot();
+ canvas.drawBitmapRect(tmp, SkRect::MakeIWH(src.width(), src.height()), nullptr);
+ *result = dev->accessBitmap(false);
}
+ return true;
}
SkFlattenable* SkDownSampleImageFilter::CreateProc(SkReadBuffer& buffer) {