commit 41342971c28726522c760aebf26db96f53756cf5
author John Reck <jreck@google.com> Sat Feb 15 01:03:02 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Feb 15 01:03:02 2014 +0000
tree 629f2ea5648edabf0d00829b500e9b562ed6b8e1
parent 12623f65275475a13109986f9f993a0887caef9b
parent a39dd595791b41222ab310b5e8a76a64faa8ba5c

Merge "Refcounting is hard"

libs/hwui/DeferredLayerUpdater.cpp

diff --git a/libs/hwui/DeferredLayerUpdater.cpp b/libs/hwui/DeferredLayerUpdater.cpp
index ed05d04..5d3d393 100644
--- a/libs/hwui/DeferredLayerUpdater.cpp
+++ b/libs/hwui/DeferredLayerUpdater.cpp
@@ -31,7 +31,6 @@
         , mLayer(layer)
         , mRenderer(renderer)
         , mCaches(Caches::getInstance()) {
-    mCaches.resourceCache.incrementRefcount(mLayer);
     mWidth = mLayer->layer.getWidth();
     mHeight = mLayer->layer.getHeight();
     mBlend = mLayer->isBlend();

libs/hwui/DeferredLayerUpdater.h

diff --git a/libs/hwui/DeferredLayerUpdater.h b/libs/hwui/DeferredLayerUpdater.h
index 0350eef..9800c2f 100644
--- a/libs/hwui/DeferredLayerUpdater.h
+++ b/libs/hwui/DeferredLayerUpdater.h
@@ -34,6 +34,8 @@
 // of a render pass
 class DeferredLayerUpdater {
 public:
+    // Note that DeferredLayerUpdater assumes it is taking ownership of the layer
+    // and will not call incrementRef on it as a result.
     ANDROID_API DeferredLayerUpdater(Layer* layer, OpenGLRenderer* renderer = 0);
     ANDROID_API ~DeferredLayerUpdater();