diff options
author | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-07 18:24:53 +0000 |
---|---|---|
committer | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-07 18:24:53 +0000 |
commit | a3f3079c3fa68dc79831183af4aa7ef79854f2ec (patch) | |
tree | 29458547950cf7373c9434986da2456d5d9190dd /webkit/tools/test_shell | |
parent | 7ff431eff426668988f79fb2cb23b6ae3a0ef7d1 (diff) | |
download | chromium_src-a3f3079c3fa68dc79831183af4aa7ef79854f2ec.zip chromium_src-a3f3079c3fa68dc79831183af4aa7ef79854f2ec.tar.gz chromium_src-a3f3079c3fa68dc79831183af4aa7ef79854f2ec.tar.bz2 |
WebKit Update 52867:52899.
Re-enabling a unit tests and wontfixing a worker test. Not much else.
TBR=johnnyg
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/519078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35713 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r-- | webkit/tools/test_shell/image_decoder_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/image_decoder_unittest.cc b/webkit/tools/test_shell/image_decoder_unittest.cc index 89d38e7..7384ff30 100644 --- a/webkit/tools/test_shell/image_decoder_unittest.cc +++ b/webkit/tools/test_shell/image_decoder_unittest.cc @@ -75,8 +75,8 @@ void VerifyImage(WebCore::ImageDecoder* decoder, decoder->frameBufferAtIndex(frame_index); ASSERT_NE(static_cast<WebCore::RGBA32Buffer*>(NULL), image_buffer) << path.value(); - // EXPECT_EQ(WebCore::RGBA32Buffer::FrameComplete, image_buffer->status()) << - // path.value(); + EXPECT_EQ(WebCore::RGBA32Buffer::FrameComplete, image_buffer->status()) << + path.value(); EXPECT_FALSE(decoder->failed()) << path.value(); // Calculate MD5 sum. @@ -97,8 +97,8 @@ void VerifyImage(WebCore::ImageDecoder* decoder, memcpy(&expected_digest, file_bytes.data(), sizeof expected_digest); // Verify that the sums are the same. - // EXPECT_EQ(0, memcmp(&expected_digest, &actual_digest, sizeof(MD5Digest))) << - // path.value(); + EXPECT_EQ(0, memcmp(&expected_digest, &actual_digest, sizeof(MD5Digest))) << + path.value(); } #endif |