diff options
| author |  msarett <msarett@google.com> | 2015-04-01 12:09:21 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-04-01 12:09:22 -0700 |
| commit | 68b204e61ceb0217bd7ba3a79ce11facfb61901b (patch) | |
| tree | 595d8c9e7f14b4bc733eda301a9505e650d868de | |
| parent | 60869a42a133942f852dd0f1696444c2a5c9ad83 (diff) | |
Ico test with embedded png
BUG=skia:3257
Review URL: https://codereview.chromium.org/1054673002
| -rw-r--r-- | resources/google_chrome.ico | bin | 0 -> 192708 bytes | |||
| -rw-r--r-- | tests/CodexTest.cpp | 4 |
2 files changed, 4 insertions, 0 deletions
diff --git a/resources/google_chrome.ico b/resources/google_chrome.ico Binary files differnew file mode 100644 index 0000000000..7af91eed00 --- /dev/null +++ b/resources/google_chrome.ico diff --git a/tests/CodexTest.cpp b/tests/CodexTest.cpp index 6c4fe68e27..825251854d 100644 --- 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); |