bf12c07970
This relands commitcb4d587666which was reverted by commitb6d2be1330because the original CL broke some blink layout tests. This reland let SkImageSource::filterBounds() return the dst rect with ctm applied regardless of direction. Original description: > Previously SkImageSource::filterBounds() uses the default > SkImageFilter::onFilterNodeBounds() which returns the input rect. > > Now override onFilterNodeBounds() in SkImageSource to return src > or dst rect (with transform applied). Change-Id: I915b7889ff59829ddbc4479cd66d75a0bb581e54 Reviewed-on: https://skia-review.googlesource.com/47501 Commit-Queue: Stephen White <senorblanco@chromium.org> Reviewed-by: Stephen White <senorblanco@chromium.org>
51 lines
1.5 KiB
C++
51 lines
1.5 KiB
C++
/*
|
|
* Copyright 2015 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#ifndef SkImageSource_DEFINED
|
|
#define SkImageSource_DEFINED
|
|
|
|
#include "SkImage.h"
|
|
#include "SkImageFilter.h"
|
|
|
|
class SK_API SkImageSource : public SkImageFilter {
|
|
public:
|
|
static sk_sp<SkImageFilter> Make(sk_sp<SkImage> image);
|
|
static sk_sp<SkImageFilter> Make(sk_sp<SkImage> image,
|
|
const SkRect& srcRect,
|
|
const SkRect& dstRect,
|
|
SkFilterQuality filterQuality);
|
|
|
|
SkRect computeFastBounds(const SkRect& src) const override;
|
|
|
|
SK_TO_STRING_OVERRIDE()
|
|
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkImageSource)
|
|
|
|
protected:
|
|
void flatten(SkWriteBuffer&) const override;
|
|
|
|
sk_sp<SkSpecialImage> onFilterImage(SkSpecialImage* source, const Context&,
|
|
SkIPoint* offset) const override;
|
|
sk_sp<SkImageFilter> onMakeColorSpace(SkColorSpaceXformer*) const override;
|
|
|
|
SkIRect onFilterNodeBounds(const SkIRect&, const SkMatrix&, MapDirection) const override;
|
|
|
|
private:
|
|
explicit SkImageSource(sk_sp<SkImage>);
|
|
SkImageSource(sk_sp<SkImage>,
|
|
const SkRect& srcRect,
|
|
const SkRect& dstRect,
|
|
SkFilterQuality);
|
|
|
|
sk_sp<SkImage> fImage;
|
|
SkRect fSrcRect, fDstRect;
|
|
SkFilterQuality fFilterQuality;
|
|
|
|
typedef SkImageFilter INHERITED;
|
|
};
|
|
|
|
#endif
|