summaryrefslogtreecommitdiff
path: root/libs/hwui/RenderProperties.cpp
diff options
context:
space:
mode:
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
commitc1a8a46fd45e55933b415771508f88a96ea0563a (patch)
treee272f9c7d2ba46c283526af401e9bcd0c8b41e40 /libs/hwui/RenderProperties.cpp
parentef594270bfdf227a1231fc40e39d244f5fcc6eed (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/RenderProperties.cpp')
-rw-r--r--libs/hwui/RenderProperties.cpp6
1 files changed, 3 insertions, 3 deletions
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;
}