From c1a8a46fd45e55933b415771508f88a96ea0563a Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Thu, 12 Jul 2018 12:41:28 -0400 Subject: 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 --- libs/hwui/RenderProperties.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libs/hwui/RenderProperties.cpp') diff --git a/libs/hwui/RenderProperties.cpp b/libs/hwui/RenderProperties.cpp index e49574462e9e..ff9cf45cdc73 100644 --- a/libs/hwui/RenderProperties.cpp +++ b/libs/hwui/RenderProperties.cpp @@ -44,8 +44,8 @@ void LayerProperties::reset() { } bool LayerProperties::setColorFilter(SkColorFilter* filter) { - if (mColorFilter == filter) return false; - SkRefCnt_SafeAssign(mColorFilter, filter); + if (mColorFilter.get() == filter) return false; + mColorFilter = sk_ref_sp(filter); return true; } @@ -62,7 +62,7 @@ LayerProperties& LayerProperties::operator=(const LayerProperties& other) { setOpaque(other.opaque()); setAlpha(other.alpha()); setXferMode(other.xferMode()); - setColorFilter(other.colorFilter()); + setColorFilter(other.getColorFilter()); return *this; } -- cgit v1.2.3-59-g8ed1b