Ico test with embedded png

tests/CodexTest.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Resources.h"
 #include "SkBitmap.h"
 #include "SkCodec.h"
@@ skipping 59 matching lines @@
 }
 
 DEF_TEST(Codec, r) {
     // WBMP
     check(r, "mandrill.wbmp", SkISize::Make(512, 512), true);
 
     // BMP
     check(r, "randPixels.bmp", SkISize::Make(8, 8), true);
 
     // ICO
+    // These two tests examine interestingly different behavior:
+    // Decodes an embedded BMP image
     check(r, "color_wheel.ico", SkISize::Make(128, 128), true);

[scroggo, 2015/04/01 18:28:21]

Sorry; you had a conflict with my change that just went in.

canRewind is now always true, so I removed it. Now the boolean variable is
supportsScanlineDecoding, which is false for ICO, so these should both be false.

+    // Decodes an embedded PNG image
+    check(r, "google_chrome.ico", SkISize::Make(256, 256), true);
 
     // PNG
     check(r, "arrow.png", SkISize::Make(187, 312), true);
     check(r, "baby_tux.png", SkISize::Make(240, 246), true);
     check(r, "color_wheel.png", SkISize::Make(128, 128), true);
     check(r, "half-transparent-white-pixel.png", SkISize::Make(1, 1), true);
     check(r, "mandrill_128.png", SkISize::Make(128, 128), true);
     check(r, "mandrill_16.png", SkISize::Make(16, 16), true);
     check(r, "mandrill_256.png", SkISize::Make(256, 256), true);
     check(r, "mandrill_32.png", SkISize::Make(32, 32), true);
     check(r, "mandrill_512.png", SkISize::Make(512, 512), true);
     check(r, "mandrill_64.png", SkISize::Make(64, 64), true);
     check(r, "plane.png", SkISize::Make(250, 126), true);
     check(r, "randPixels.png", SkISize::Make(8, 8), true);
     check(r, "yellow_rose.png", SkISize::Make(400, 301), true);
 }