commit 7f8aad84de1661727b467940a4f0e6f6531fc0a1
author halcanary <halcanary@google.com> Mon Jul 28 08:23:55 2014 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jul 28 08:23:55 2014 -0700
tree f0ebd95b2180c3692dd8ca7eb9058efdd72d2872
parent edb10e79f5cd1b48baa77f82705d4e711fb35ba4

SkDiscardablePixelRef returns correct indexed color on relock.

R=djsollen@google.com

Author: halcanary@google.com

Review URL: https://codereview.chromium.org/428603002

src/lazy/SkDiscardablePixelRef.cpp

diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp
index f0d7aff..ce38a4a 100644
--- a/src/lazy/SkDiscardablePixelRef.cpp
+++ b/src/lazy/SkDiscardablePixelRef.cpp
@@ -40,7 +40,7 @@
     if (fDiscardableMemory != NULL) {
         if (fDiscardableMemory->lock()) {
             rec->fPixels = fDiscardableMemory->data();
-            rec->fColorTable = NULL;
+            rec->fColorTable = fCTable.get();
             rec->fRowBytes = fRowBytes;
             return true;
         }

tests/ImageDecodingTest.cpp

diff --git a/tests/ImageDecodingTest.cpp b/tests/ImageDecodingTest.cpp
index d070f61..d8e813d 100644
--- a/tests/ImageDecodingTest.cpp
+++ b/tests/ImageDecodingTest.cpp
@@ -723,3 +723,27 @@
         }
     }
 }
+
+DEF_TEST(DiscardablePixelRef_SecondLockColorTableCheck, r) {
+    SkString resourceDir = GetResourcePath();
+    SkString path = SkOSPath::SkPathJoin(resourceDir.c_str(), "randPixels.gif");
+    if (!sk_exists(path.c_str())) {
+        return;
+    }
+    SkAutoDataUnref encoded(SkData::NewFromFileName(path.c_str()));
+    SkBitmap bitmap;
+    if (!SkInstallDiscardablePixelRef(
+            SkDecodingImageGenerator::Create(
+                    encoded, SkDecodingImageGenerator::Options()), &bitmap)) {
+        ERRORF(r, "SkInstallDiscardablePixelRef [randPixels.gif] failed.");
+        return;
+    }
+    {
+        SkAutoLockPixels alp(bitmap);
+        REPORTER_ASSERT(r, bitmap.getColorTable() && "first pass");
+    }
+    {
+        SkAutoLockPixels alp(bitmap);
+        REPORTER_ASSERT(r, bitmap.getColorTable() && "second pass");
+    }
+}