diff options
| author | Ben Wagner <bungeman@google.com> | 2018-07-12 12:41:28 -0400 |
|---|---|---|
| committer | Ben Wagner <bungeman@google.com> | 2018-07-12 19:19:53 +0000 |
| commit | c1a8a46fd45e55933b415771508f88a96ea0563a (patch) | |
| tree | e272f9c7d2ba46c283526af401e9bcd0c8b41e40 /libs/hwui/pipeline/skia/RenderNodeDrawable.cpp | |
| parent | ef594270bfdf227a1231fc40e39d244f5fcc6eed (diff) | |
Remove use of SkRefCnt_SafeAssign.
Update pointer to SkRefCnt fields which require it to sk_sp.
Test: refactoring CL. Existing unit tests still pass.
Change-Id: I4f3eb790ee67c09746708458c4492569b64cc58f
Diffstat (limited to 'libs/hwui/pipeline/skia/RenderNodeDrawable.cpp')
| -rw-r--r-- | libs/hwui/pipeline/skia/RenderNodeDrawable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp index c195a8eee870..85fdc103b1e3 100644 --- a/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp +++ b/libs/hwui/pipeline/skia/RenderNodeDrawable.cpp @@ -156,10 +156,10 @@ static bool layerNeedsPaint(const LayerProperties& properties, float alphaMultip SkPaint* paint) { paint->setFilterQuality(kLow_SkFilterQuality); if (alphaMultiplier < 1.0f || properties.alpha() < 255 || - properties.xferMode() != SkBlendMode::kSrcOver || properties.colorFilter() != nullptr) { + properties.xferMode() != SkBlendMode::kSrcOver || properties.getColorFilter() != nullptr) { paint->setAlpha(properties.alpha() * alphaMultiplier); paint->setBlendMode(properties.xferMode()); - paint->setColorFilter(sk_ref_sp(properties.colorFilter())); + paint->setColorFilter(sk_ref_sp(properties.getColorFilter())); return true; } return false; |