Ico test with embedded png

BUG=skia:3257

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

diff --git a/resources/google_chrome.ico b/resources/google_chrome.ico
new file mode 100644 (file)
index 0000000..7af91ee
Binary files /dev/null and b/resources/google_chrome.ico differ

diff --git a/tests/CodexTest.cpp b/tests/CodexTest.cpp
index 6c4fe68..8252518 100644 (file)
--- a/tests/CodexTest.cpp
+++ b/tests/CodexTest.cpp
@@ -88,7 +88,11 @@ DEF_TEST(Codec, r) {
     check(r, "randPixels.bmp", SkISize::Make(8, 8), false);
 
     // ICO
+    // These two tests examine interestingly different behavior:
+    // Decodes an embedded BMP image
     check(r, "color_wheel.ico", SkISize::Make(128, 128), false);
+    // Decodes an embedded PNG image
+    check(r, "google_chrome.ico", SkISize::Make(256, 256), false);
 
     // PNG
     check(r, "arrow.png", SkISize::Make(187, 312), true);