Store ninepatch chunks in the png header in CodexTest

tests/CodexTest.cpp

Index: tests/CodexTest.cpp
diff --git a/tests/CodexTest.cpp b/tests/CodexTest.cpp
index 94eea65b938ad3d9ec96663b1e8422fde80f02f8..5f237eabaa52c1220963281c226f4361ad3e32cb 100644
--- a/tests/CodexTest.cpp
+++ b/tests/CodexTest.cpp
@@ -742,18 +742,13 @@ DEF_TEST(Codec_pngChunkReader, r) {
 
     // Create some chunks that match the Android framework's use.
     static png_unknown_chunk gUnknowns[] = {
-        { "npOl", (png_byte*)"outline", sizeof("outline"), PNG_HAVE_PLTE },
-        { "npLb", (png_byte*)"layoutBounds", sizeof("layoutBounds"), PNG_HAVE_PLTE },
-        { "npTc", (png_byte*)"ninePatchData", sizeof("ninePatchData"), PNG_HAVE_PLTE },
+        { "npOl", (png_byte*)"outline", sizeof("outline"), PNG_HAVE_IHDR },
+        { "npLb", (png_byte*)"layoutBounds", sizeof("layoutBounds"), PNG_HAVE_IHDR },
+        { "npTc", (png_byte*)"ninePatchData", sizeof("ninePatchData"), PNG_HAVE_IHDR },
     };
 
     png_set_keep_unknown_chunks(png, PNG_HANDLE_CHUNK_ALWAYS, (png_byte*)"npOl\0npLb\0npTc\0", 3);
     png_set_unknown_chunks(png, info, gUnknowns, SK_ARRAY_COUNT(gUnknowns));
-#if PNG_LIBPNG_VER < 10600

[msarett, 2016/01/07 17:43:01]

While we do want Skia to work for any version of libpng, I don't have a setup
(with an old libpng) to test if/how we need to modify this code block.

I think it's best to remove it.

[scroggo, 2016/01/07 18:04:43]

You don't think we should just change it to PNG_HAVE_IHDR?

[msarett, 2016/01/07 18:20:48]

Hmmm ok - I went back and forth on this anyway.  I'm not sure it will work or if
it's necessary, but it seems benign at worst.

-    /* Deal with unknown chunk location bug in 1.5.x and earlier */
-    png_set_unknown_chunk_location(png, info, 0, PNG_HAVE_PLTE);
-    png_set_unknown_chunk_location(png, info, 1, PNG_HAVE_PLTE);
-#endif
 
     png_write_info(png, info);