d0f1969100
Reason for revert: try again Original issue's description: > Fix bounds computation of all 0-input filters. > > The SkRectShaderImageFilter had the same bug as previously fixed for > SkBitmapSource and SkPictureImageFilter. Rather than copy-and-paste > the implementation, this change makes all filters with 0 inputs return > their source bounds, instead of returning false. > > BUG=427251 > > Committed: https://skia.googlesource.com/skia/+/ba036cc82b5a543a13cafd11a19ba0e3087fca38 TBR=bsalomon@google.com,senorblanco@chromium.org NOTREECHECKS=true NOTRY=true BUG=427251 Review URL: https://codereview.chromium.org/678273002
46 lines
1.5 KiB
C++
46 lines
1.5 KiB
C++
/*
|
|
* Copyright 2012 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.
|
|
*/
|
|
|
|
#ifndef SkBitmapSource_DEFINED
|
|
#define SkBitmapSource_DEFINED
|
|
|
|
#include "SkImageFilter.h"
|
|
#include "SkBitmap.h"
|
|
|
|
class SK_API SkBitmapSource : public SkImageFilter {
|
|
public:
|
|
static SkBitmapSource* Create(const SkBitmap& bitmap) {
|
|
return SkNEW_ARGS(SkBitmapSource, (bitmap));
|
|
}
|
|
static SkBitmapSource* Create(const SkBitmap& bitmap, const SkRect& srcRect,
|
|
const SkRect& dstRect) {
|
|
return SkNEW_ARGS(SkBitmapSource, (bitmap, srcRect, dstRect));
|
|
}
|
|
virtual void computeFastBounds(const SkRect& src, SkRect* dst) const SK_OVERRIDE;
|
|
|
|
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapSource)
|
|
|
|
protected:
|
|
explicit SkBitmapSource(const SkBitmap& bitmap);
|
|
SkBitmapSource(const SkBitmap& bitmap, const SkRect& srcRect, const SkRect& dstRect);
|
|
#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
|
|
explicit SkBitmapSource(SkReadBuffer& buffer);
|
|
#endif
|
|
virtual void flatten(SkWriteBuffer&) const SK_OVERRIDE;
|
|
|
|
virtual bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
|
|
SkBitmap* result, SkIPoint* offset) const SK_OVERRIDE;
|
|
virtual bool onFilterBounds(const SkIRect& src, const SkMatrix& ctm, SkIRect* dst) const SK_OVERRIDE;
|
|
|
|
private:
|
|
SkBitmap fBitmap;
|
|
SkRect fSrcRect, fDstRect;
|
|
typedef SkImageFilter INHERITED;
|
|
};
|
|
|
|
#endif
|