Update to bc8dcc3ede286fbcaac3f741c379297cffff0eea
Same version as used by Chromium 57.0.2987.108
Fixes: 28051413, 34337228
Test: cts-tradefed run cts-dev -m CtsGraphicsTestCases -t android.graphics.pdf.cts
cts-tradefed run cts-dev -m Print -t android.print.pdf.cts
Change-Id: I1bf02cae444c9f08711953c4475af10db2becd58
diff --git a/samples/image_diff_png.cc b/samples/image_diff_png.cc
index 6ad7f88..18753e2 100644
--- a/samples/image_diff_png.cc
+++ b/samples/image_diff_png.cc
@@ -9,7 +9,7 @@
// This is a duplicate of ui/gfx/codec/png_codec.cc, after removing code related
// to Skia, that we can use when running layout tests with minimal dependencies.
-#include "image_diff_png.h"
+#include "samples/image_diff_png.h"
#include <stdlib.h>
#include <string.h>
@@ -17,7 +17,7 @@
#include <string>
#include "third_party/base/logging.h"
-#include "third_party/lpng_v163/png.h"
+#include "third_party/libpng16/png.h"
#include "third_party/zlib_v128/zlib.h"
namespace image_diff_png {
@@ -69,7 +69,7 @@
} // namespace
-// Decoder --------------------------------------------------------------------
+// Decoder
//
// This code is based on WebKit libpng interface (PNGImageDecoder), which is
// in turn based on the Mozilla png decoder.
@@ -355,7 +355,7 @@
return true;
}
-// Encoder --------------------------------------------------------------------
+// Encoder
//
// This section of the code is based on nsPNGEncoder.cpp in Mozilla
// (Copyright 2005 Google Inc.)
@@ -641,4 +641,4 @@
std::vector<Comment>(), output);
}
-} // image_diff_png
+} // namespace image_diff_png