Store ninepatch chunks in the png header in CodexTest

tests/CodexTest.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Resources.h"
 #include "SkAndroidCodec.h"
 #include "SkBitmap.h"
@@ skipping 724 matching lines @@
 
     SkDynamicMemoryWStream wStream;
     png_set_write_fn(png, (void*) (&wStream), codex_test_write_fn, nullptr);
 
     png_set_IHDR(png, info, (png_uint_32)w, (png_uint_32)h, 8,
                  PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE,
                  PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
 
     // 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);
 
     for (int j = 0; j < h; j++) {
         png_bytep row = (png_bytep)(bm.getAddr(0, j));
         png_write_rows(png, &row, 1);
     }
     png_write_end(png, info);
     png_destroy_write_struct(&png, &info);
 
@@ skipping 180 matching lines @@
     // Now test an image which is too big. Any image with a larger header (i.e.
     // has bigger width/height) is also too big.
     const unsigned char tooBigWbmp[] = { 0x00, 0x00,           // Header
                                          0x84, 0x80, 0x00,     // W: 65536
                                          0x84, 0x80, 0x00 };   // H: 65536
     stream.reset(new SkMemoryStream(tooBigWbmp, sizeof(tooBigWbmp), false));
     codec.reset(SkCodec::NewFromStream(stream.detach()));
 
     REPORTER_ASSERT(r, !codec);
 }