diff options
author | 2016-10-03 12:57:32 -0400 | |
---|---|---|
committer | 2016-10-03 17:17:10 +0000 | |
commit | 0591897548c8fcb7d53cc94053e01702e58f1ac5 (patch) | |
tree | 099bf31c7bf4bd3062d2e7a8b4268a89f1fd61a2 /src/core/SkBlitter_Sprite.cpp | |
parent | a224bb7027f022cf78376cb7afa2fff83d59153e (diff) |
replace SkXfermode obj with SkBlendMode enum in paints
BUG=skia:5814
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2714
Change-Id: I4fb489ba6b3f77b458f7e4a99f79c7ad10859135
Reviewed-on: https://skia-review.googlesource.com/2714
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkBlitter_Sprite.cpp')
-rw-r--r-- | src/core/SkBlitter_Sprite.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/core/SkBlitter_Sprite.cpp b/src/core/SkBlitter_Sprite.cpp index 950f18791f..cef4cfaa2f 100644 --- a/src/core/SkBlitter_Sprite.cpp +++ b/src/core/SkBlitter_Sprite.cpp @@ -68,14 +68,11 @@ public: if (0xFF != paint.getAlpha()) { return false; } - SkXfermode::Mode mode; - if (!SkXfermode::AsMode(paint.getXfermode(), &mode)) { - return false; - } - if (SkXfermode::kSrc_Mode == mode) { + SkBlendMode mode = paint.getBlendMode(); + if (SkBlendMode::kSrc == mode) { return true; } - if (SkXfermode::kSrcOver_Mode == mode && src.isOpaque()) { + if (SkBlendMode::kSrcOver == mode && src.isOpaque()) { return true; } @@ -85,7 +82,7 @@ public: return false; } - return SkXfermode::kSrcOver_Mode == mode; + return SkBlendMode::kSrcOver == mode; } SkSpriteBlitter_Src_SrcOver(const SkPixmap& src) @@ -94,14 +91,11 @@ public: void setup(const SkPixmap& dst, int left, int top, const SkPaint& paint) override { SkASSERT(Supports(dst, fSource, paint)); this->INHERITED::setup(dst, left, top, paint); - SkXfermode::Mode mode; - if (!SkXfermode::AsMode(paint.getXfermode(), &mode)) { - SkFAIL("Should never happen."); - } + SkBlendMode mode = paint.getBlendMode(); - SkASSERT(mode == SkXfermode::kSrcOver_Mode || mode == SkXfermode::kSrc_Mode); + SkASSERT(mode == SkBlendMode::kSrcOver || mode == SkBlendMode::kSrc); - if (mode == SkXfermode::kSrcOver_Mode && !fSource.isOpaque()) { + if (mode == SkBlendMode::kSrcOver && !fSource.isOpaque()) { fUseMemcpy = false; } } |