commit 68b204e61ceb0217bd7ba3a79ce11facfb61901b
author msarett <msarett@google.com> Wed Apr 01 12:09:21 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Apr 01 12:09:22 2015 -0700
tree 595d8c9e7f14b4bc733eda301a9505e650d868de
parent 60869a42a133942f852dd0f1696444c2a5c9ad83

Ico test with embedded png

BUG=skia:3257

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

resources/google_chrome.ico

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

tests/CodexTest.cpp

diff --git a/tests/CodexTest.cpp b/tests/CodexTest.cpp
index 6c4fe68..8252518 100644
--- a/tests/CodexTest.cpp
+++ b/tests/CodexTest.cpp
@@ -88,7 +88,11 @@
     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);