| Index: include/effects/SkBitmapSource.h
|
| diff --git a/include/effects/SkBitmapSource.h b/include/effects/SkBitmapSource.h
|
| index 76f51f54e8d89860cc80ae057ca792a00f846a22..2aa8fe96fabcc4d3152c98518f6427eb3aba6594 100644
|
| --- a/include/effects/SkBitmapSource.h
|
| +++ b/include/effects/SkBitmapSource.h
|
| @@ -25,18 +25,15 @@ public:
|
| SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapSource)
|
|
|
| protected:
|
| + explicit SkBitmapSource(const SkBitmap& bitmap);
|
| + SkBitmapSource(const SkBitmap& bitmap, const SkRect& srcRect, const SkRect& dstRect);
|
| explicit SkBitmapSource(SkReadBuffer& buffer);
|
| 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;
|
|
|
| -#ifdef SK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS
|
| -public:
|
| -#endif
|
| - explicit SkBitmapSource(const SkBitmap& bitmap);
|
| - SkBitmapSource(const SkBitmap& bitmap, const SkRect& srcRect, const SkRect& dstRect);
|
| -
|
| private:
|
| SkBitmap fBitmap;
|
| SkRect fSrcRect, fDstRect;
|
|
|