Update skia to test with libpng to 1.6.10

dm/DMSrcSink.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 "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkCodec.h"
@@ skipping 63 matching lines @@
 
 bool CodecSrc::veto(SinkFlags flags) const {
     // No need to test decoding to non-raster or indirect backend.
     // TODO: Once we implement GPU paths (e.g. JPEG YUV), we should use a deferred decode to
     // let the GPU handle it.
     return flags.type != SinkFlags::kRaster
         || flags.approach != SinkFlags::kDirect;
 }
 
 Error CodecSrc::draw(SkCanvas* canvas) const {
+    SkDebugf("\nCodec %s\n", fPath.c_str());

[scroggo, 2015/08/26 21:53:32]

I'm guessing we do not want these print statements checked in?

     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
     if (!encoded) {
         return SkStringPrintf("Couldn't read %s.", fPath.c_str());
     }
     SkAutoTDelete<SkCodec> codec(SkScaledCodec::NewFromData(encoded));
     if (NULL == codec.get()) {
         // scaledCodec not supported, try normal codec
         codec.reset(SkCodec::NewFromData(encoded));
         if (NULL == codec.get()) {
             return SkStringPrintf("Couldn't create codec for %s.", fPath.c_str());
@@ skipping 394 matching lines @@
         || flags.approach != SinkFlags::kDirect;
 }
 
 Error ImageSrc::draw(SkCanvas* canvas) const {
     SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
     if (!encoded) {
         return SkStringPrintf("Couldn't read %s.", fPath.c_str());
     }
     const SkColorType dstColorType = canvas->imageInfo().colorType();
     if (fDivisor == 0) {
+        SkDebugf("\nImage %s\n", fPath.c_str());
         // Decode the full image.
         SkBitmap bitmap;
         if (!SkImageDecoder::DecodeMemory(encoded->data(), encoded->size(), &bitmap,
                                           dstColorType, SkImageDecoder::kDecodePixels_Mode)) {
             return SkStringPrintf("Couldn't decode %s.", fPath.c_str());
         }
         if (kRGB_565_SkColorType == dstColorType && !bitmap.isOpaque()) {
             // Do not draw a bitmap with alpha to a destination without alpha.
             return Error::Nonfatal("Uninteresting to decode image with alpha into 565.");
         }
         encoded.reset((SkData*)NULL);  // Might as well drop this when we're done with it.
         canvas->drawBitmap(bitmap, 0,0);
         return "";
     }
+    SkDebugf("\nSubset %s\n", fPath.c_str());
     // Decode subsets.  This is a little involved.
     SkAutoTDelete<SkMemoryStream> stream(new SkMemoryStream(encoded));
     SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(stream.get()));
     if (!decoder) {
         return SkStringPrintf("Can't find a good decoder for %s.", fPath.c_str());
     }
     stream->rewind();
     int w,h;
     if (!decoder->buildTileIndex(stream.detach(), &w, &h)) {
         return Error::Nonfatal("Subset decoding not supported.");
@@ skipping 567 matching lines @@
             skr.visit<void>(i, drawsAsSingletonPictures);
         }
         SkAutoTUnref<SkPicture> macroPic(macroRec.endRecordingAsPicture());
 
         canvas->drawPicture(macroPic);
         return "";
     });
 }
 
 }  // namespace DM