aboutsummaryrefslogtreecommitdiff
path: root/src/effects
diff options
context:
space:
mode:
authorBrian Osman <brianosman@google.com>2018-11-05 15:06:26 -0500
committerSkia Commit-Bot <skia-commit-bot@chromium.org>2018-11-05 20:36:24 +0000
commit9a9baae1258659e679792a335e14937edaf4cee5 (patch)
tree7bdc1811f8ec14314f8164b693016324a965cdc5 /src/effects
parent7da4676e99b6538c6a1ec19ba704eb1d2403eff7 (diff)
downloadskqp-9a9baae1258659e679792a335e14937edaf4cee5.tar.gz
Use SkPMColor4f throughout clear APIs
Bug: skia: Change-Id: I5386e27edbcf39233880d869841a6632ecb9416c Reviewed-on: https://skia-review.googlesource.com/c/168261 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
Diffstat (limited to 'src/effects')
-rw-r--r--src/effects/imagefilters/SkAlphaThresholdFilter.cpp3
-rw-r--r--src/effects/imagefilters/SkMorphologyImageFilter.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
index 589c105d32..8cc485fc03 100644
--- a/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
+++ b/src/effects/imagefilters/SkAlphaThresholdFilter.cpp
@@ -117,7 +117,8 @@ sk_sp<GrTextureProxy> SkAlphaThresholdFilterImpl::createMaskTexture(GrContext* c
GrPaint paint;
paint.setPorterDuffXPFactory(SkBlendMode::kSrc);
SkRegion::Iterator iter(fRegion);
- rtContext->clear(nullptr, 0x0, GrRenderTargetContext::CanClearFullscreen::kYes);
+ rtContext->clear(nullptr, SK_PMColor4fTRANSPARENT,
+ GrRenderTargetContext::CanClearFullscreen::kYes);
GrFixedClip clip(SkIRect::MakeWH(bounds.width(), bounds.height()));
while (!iter.done()) {
diff --git a/src/effects/imagefilters/SkMorphologyImageFilter.cpp b/src/effects/imagefilters/SkMorphologyImageFilter.cpp
index 9c270407b9..ae07ffbbdf 100644
--- a/src/effects/imagefilters/SkMorphologyImageFilter.cpp
+++ b/src/effects/imagefilters/SkMorphologyImageFilter.cpp
@@ -488,8 +488,8 @@ static sk_sp<SkSpecialImage> apply_morphology(
radius.fWidth, morphType, GrMorphologyEffect::Direction::kX);
SkIRect clearRect = SkIRect::MakeXYWH(dstRect.fLeft, dstRect.fBottom,
dstRect.width(), radius.fHeight);
- GrColor clearColor =
- GrMorphologyEffect::Type::kErode == morphType ? SK_ColorWHITE : SK_ColorTRANSPARENT;
+ SkPMColor4f clearColor = GrMorphologyEffect::Type::kErode == morphType
+ ? SK_PMColor4fWHITE : SK_PMColor4fTRANSPARENT;
dstRTContext->clear(&clearRect, clearColor, GrRenderTargetContext::CanClearFullscreen::kNo);
srcTexture = dstRTContext->asTextureProxyRef();