Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(475)

Unified Diff: webkit/tools/test_shell/image_decoder_unittest.cc

Issue 164506: Re-enable the ICO chunked decoding test. Remove check for condition that is ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/image_decoder_unittest.cc
===================================================================
--- webkit/tools/test_shell/image_decoder_unittest.cc (revision 23344)
+++ webkit/tools/test_shell/image_decoder_unittest.cc (working copy)
@@ -154,9 +154,10 @@
// Make sure the image decoder doesn't fail when we ask for the frame buffer
// for this partial image.
decoder->setData(shared_contents.get(), false);
- EXPECT_NE(static_cast<WebCore::RGBA32Buffer*>(NULL),
- decoder->frameBufferAtIndex(0)) << path;
EXPECT_FALSE(decoder->failed()) << path;
+ // NOTE: We can't check that frame 0 is non-NULL, because if this is an ICO
+ // and we haven't yet supplied enough data to read the directory, there is
+ // no framecount and thus no first frame.
// Make sure passing the complete image results in successful decoding.
shared_contents->append(
« no previous file with comments | « no previous file | webkit/tools/webcore_unit_tests/ICOImageDecoder_unittest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698