AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove SkCanvas::ImageSetEntry constructors

Browse Source 
Change-Id: Ib75b6a836184df739e4690dc275421e015d6a9bb
Reviewed-on: https://skia-review.googlesource.com/c/173228
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
This commit is contained in:
Brian Salomon 2018-11-28 13:27:06 -05:00 committed by Skia Commit-Bot
parent c8f6ab3885
commit 572fdcf08a
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/core/SkCanvas.h
View File

@ -1825,15 +1825,7 @@ public:
};
/** This is used by the experimental API below. */
struct SK_API ImageSetEntry {
// Temporary constructor for SkiaRenderer which currently does not use alpha.
ImageSetEntry(sk_sp<const SkImage>, const SkRect& srcRect, const SkRect& dstRect,
unsigned aaFlags);
// Temporary constructor for SkiaRenderer to transition to per-quad alpha.
ImageSetEntry(sk_sp<const SkImage>, const SkRect& srcRect, const SkRect& dstRect,
float alpha, unsigned aaFlags);
// Required so long as above constructors are necessary.
ImageSetEntry() = default;
struct ImageSetEntry {
sk_sp<const SkImage> fImage;
SkRect fSrcRect;
SkRect fDstRect;

17
src/core/SkCanvas.cpp
View File

@ -56,23 +56,6 @@
#define RETURN_ON_NULL(ptr) do { if (nullptr == (ptr)) return; } while (0)
#define RETURN_ON_FALSE(pred) do { if (!(pred)) return; } while (0)
///////////////////////////////////////////////////////////////////////////////////////////////////
SkCanvas::ImageSetEntry::ImageSetEntry(sk_sp<const SkImage> image, const SkRect& srcRect,
const SkRect& dstRect, unsigned aaFlags)
: fImage(std::move(image))
, fSrcRect(srcRect)
, fDstRect(dstRect)
, fAlpha(1.f)
, fAAFlags(aaFlags) {}
SkCanvas::ImageSetEntry::ImageSetEntry(sk_sp<const SkImage> image, const SkRect& srcRect,
const SkRect& dstRect, float alpha, unsigned aaFlags)
: fImage(std::move(image))
, fSrcRect(srcRect)
, fDstRect(dstRect)
, fAlpha(alpha)
, fAAFlags(aaFlags) {}
///////////////////////////////////////////////////////////////////////////////////////////////////
/*