commit 76d3a1b8d035d27bc80b0f2fc480a903bd001514
author Derek Sollenberger <djsollen@google.com> Tue Dec 10 12:28:58 2013 -0500
committer Derek Sollenberger <djsollen@google.com> Fri Feb 07 17:06:14 2014 -0500
tree a6346bbf593d565d89990f0bddecd2a5df92de9d
parent 8852ab4357ffb653bafb36f3b9272866834f7a72

Removing SkiaColorFilter and inspecting the native object directly.

bug: 10650594
Change-Id: I4fcf66d008765afa0e35d011f58bc792183cb74f

libs/hwui/Layer.cpp

diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp
index 742ffd47..70eeb39 100644
--- a/libs/hwui/Layer.cpp
+++ b/libs/hwui/Layer.cpp
@@ -51,7 +51,7 @@
 }
 
 Layer::~Layer() {
-    if (colorFilter) caches.resourceCache.decrementRefcount(colorFilter);
+    SkSafeUnref(colorFilter);
     removeFbo();
     deleteTexture();
 
@@ -135,14 +135,8 @@
     OpenGLRenderer::getAlphaAndModeDirect(paint, &alpha, &mode);
 }
 
-void Layer::setColorFilter(SkiaColorFilter* filter) {
-    if (colorFilter) {
-        caches.resourceCache.decrementRefcount(colorFilter);
-    }
-    colorFilter = filter;
-    if (colorFilter) {
-        caches.resourceCache.incrementRefcount(colorFilter);
-    }
+void Layer::setColorFilter(SkColorFilter* filter) {
+    SkRefCnt_SafeAssign(colorFilter, filter);
 }
 
 void Layer::bindTexture() const {