diff options
| author |  Mike Reed <reed@google.com> | 2016-11-09 10:38:09 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-09 17:03:12 +0000 |
| commit | 6a01554e9e8687c56e6b6707e0c6a02062a1824e (patch) | |
| tree | 75c73de8c625e03543b6eaf5e392d869a7c47d84 /src/core/SkLinearBitmapPipeline.cpp | |
| parent | d3ea9b75f7e675f0f57545694cd4add43b8e2f4b (diff) | |
remove use of xfermode* in procs
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4592
Change-Id: I99f35924ff5325dfac527bb573a86d2d0366e0b3
Reviewed-on: https://skia-review.googlesource.com/4592
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core/SkLinearBitmapPipeline.cpp')
| -rw-r--r-- | src/core/SkLinearBitmapPipeline.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/core/SkLinearBitmapPipeline.cpp b/src/core/SkLinearBitmapPipeline.cpp index d77f28bb5b..d6634bc711 100644 --- a/src/core/SkLinearBitmapPipeline.cpp +++ b/src/core/SkLinearBitmapPipeline.cpp @@ -671,12 +671,11 @@ bool SkLinearBitmapPipeline::ClonePipelineForBlitting( SkFilterQuality filterQuality, const SkPixmap& srcPixmap, float finalAlpha, - SkXfermode::Mode xferMode, + SkBlendMode blendMode, const SkImageInfo& dstInfo) { - if (xferMode == SkXfermode::kSrcOver_Mode - && srcPixmap.info().alphaType() == kOpaque_SkAlphaType) { - xferMode = SkXfermode::kSrc_Mode; + if (blendMode == SkBlendMode::kSrcOver && srcPixmap.info().alphaType() == kOpaque_SkAlphaType) { + blendMode = SkBlendMode::kSrc; } if (matrixMask & ~SkMatrix::kTranslate_Mask ) { return false; } @@ -689,11 +688,11 @@ bool SkLinearBitmapPipeline::ClonePipelineForBlitting( return false; } - if (xferMode != SkXfermode::kSrc_Mode && xferMode != SkXfermode::kSrcOver_Mode) { + if (blendMode != SkBlendMode::kSrc && blendMode != SkBlendMode::kSrcOver) { return false; } - pipelineStorage->init(pipeline, srcPixmap, xferMode, dstInfo); + pipelineStorage->init(pipeline, srcPixmap, blendMode, dstInfo); return true; } @@ -701,14 +700,14 @@ bool SkLinearBitmapPipeline::ClonePipelineForBlitting( SkLinearBitmapPipeline::SkLinearBitmapPipeline( const SkLinearBitmapPipeline& pipeline, const SkPixmap& srcPixmap, - SkXfermode::Mode mode, + SkBlendMode mode, const SkImageInfo& dstInfo) { - SkASSERT(mode == SkXfermode::kSrc_Mode || mode == SkXfermode::kSrcOver_Mode); + SkASSERT(mode == SkBlendMode::kSrc || mode == SkBlendMode::kSrcOver); SkASSERT(srcPixmap.info().colorType() == dstInfo.colorType() && srcPixmap.info().colorType() == kRGBA_8888_SkColorType); - if (mode == SkXfermode::kSrc_Mode) { + if (mode == SkBlendMode::kSrc) { fSampleStage.initSink<RGBA8888UnitRepeatSrc>( srcPixmap.writable_addr32(0, 0), srcPixmap.rowBytes() / 4); fLastStage = fSampleStage.getInterface<DestinationInterface, RGBA8888UnitRepeatSrc>(); |