From 65a8e12287f40b1f3c3623397656f813b942b36f Mon Sep 17 00:00:00 2001 From: scroggo Date: Wed, 1 Apr 2015 10:24:37 -0700 Subject: [PATCH] Acknowledge that SkIcoCodec can rewind and test it. Since SkIcoCodec has an SkCodec for its encoded images, backed by SkMemoryStreams, the SkMemoryStream can always rewind, and will be rewound by the sub-codec if necessary (now that SkBmpCodec and SkPngCodec support rewinding). Depends on https://codereview.chromium.org/1057483003/ and https://codereview.chromium.org/1048423003/ (DIFFERENT ISSUES). BUG=skia:3257 Review URL: https://codereview.chromium.org/1054603002 --- tests/CodexTest.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/CodexTest.cpp b/tests/CodexTest.cpp index f201070..f4ed0e8 100644 --- a/tests/CodexTest.cpp +++ b/tests/CodexTest.cpp @@ -77,8 +77,7 @@ DEF_TEST(Codec, r) { check(r, "randPixels.bmp", SkISize::Make(8, 8), true); // ICO - // TODO (msarett): SkIcoCodec should be able to rewind. - check(r, "color_wheel.ico", SkISize::Make(128, 128), false); + check(r, "color_wheel.ico", SkISize::Make(128, 128), true); // PNG check(r, "arrow.png", SkISize::Make(187, 312), true); -- 2.7.4