1 files changed, 4 insertions, 17 deletions

diff --git a/libs/hwui/DisplayListRenderer.h b/libs/hwui/DisplayListRenderer.h
index e9c937cbeb0c..7350082bdad7 100644
--- a/libs/hwui/DisplayListRenderer.h
+++ b/libs/hwui/DisplayListRenderer.h
@@ -215,17 +215,11 @@ private:
         if (!paint) return NULL;
 
         const SkPaint* paintCopy = mPaintMap.valueFor(paint);
-        if (paintCopy == NULL
-                || paintCopy->getGenerationID() != paint->getGenerationID()
-                // We can't compare shader pointers because that will always
-                // change as we do partial copying via wrapping. However, if the
-                // shader changes the paint generationID will have changed and
-                // so we don't hit this comparison anyway
-                || !(paint->getShader() && paintCopy->getShader()
-                        && paint->getShader()->getGenerationID() == paintCopy->getShader()->getGenerationID())) {
-            paintCopy = copyPaint(paint);
+        if (paintCopy == NULL || paintCopy->getGenerationID() != paint->getGenerationID()) {
+            paintCopy = new SkPaint(*paint);
             // replaceValueFor() performs an add if the entry doesn't exist
             mPaintMap.replaceValueFor(paint, paintCopy);
+            mDisplayListData->paints.add(paintCopy);
         }
 
         return paintCopy;
@@ -234,15 +228,8 @@ private:
     inline SkPaint* copyPaint(const SkPaint* paint) {
         if (!paint) return NULL;
         SkPaint* paintCopy = new SkPaint(*paint);
-        if (paint->getShader()) {
-            SkShader* shaderCopy = SkShader::CreateLocalMatrixShader(
-                    paint->getShader(), paint->getShader()->getLocalMatrix());
-            paintCopy->setShader(shaderCopy);
-            paintCopy->setGenerationID(paint->getGenerationID());
-            shaderCopy->setGenerationID(paint->getShader()->getGenerationID());
-            shaderCopy->unref();
-        }
         mDisplayListData->paints.add(paintCopy);
+
         return paintCopy;
     }