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

Side by Side Diff: webkit/tools/test_shell/image_decoder_unittest.cc

Issue 7585029: base: Remove using declaration of MD5Digest now that hunspell was fixed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket/web_socket_server_socket.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/tools/test_shell/image_decoder_unittest.h" 5 #include "webkit/tools/test_shell/image_decoder_unittest.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/md5.h" 9 #include "base/md5.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 16 matching lines...) Expand all
27 ImageDecoderTestFileSelection file_selection, 27 ImageDecoderTestFileSelection file_selection,
28 const int64 threshold) { 28 const int64 threshold) {
29 if (file_selection == TEST_ALL) 29 if (file_selection == TEST_ALL)
30 return false; 30 return false;
31 31
32 int64 image_size = 0; 32 int64 image_size = 0;
33 file_util::GetFileSize(path, &image_size); 33 file_util::GetFileSize(path, &image_size);
34 return (file_selection == TEST_SMALLER) == (image_size > threshold); 34 return (file_selection == TEST_SMALLER) == (image_size > threshold);
35 } 35 }
36 36
37 } // anonymous namespace 37 } // namespace
38 38
39 void ReadFileToVector(const FilePath& path, std::vector<char>* contents) { 39 void ReadFileToVector(const FilePath& path, std::vector<char>* contents) {
40 std::string raw_image_data; 40 std::string raw_image_data;
41 file_util::ReadFileToString(path, &raw_image_data); 41 file_util::ReadFileToString(path, &raw_image_data);
42 contents->resize(raw_image_data.size()); 42 contents->resize(raw_image_data.size());
43 memcpy(&contents->at(0), raw_image_data.data(), raw_image_data.size()); 43 memcpy(&contents->at(0), raw_image_data.data(), raw_image_data.size());
44 } 44 }
45 45
46 FilePath GetMD5SumPath(const FilePath& path) { 46 FilePath GetMD5SumPath(const FilePath& path) {
47 static const FilePath::StringType kDecodedDataExtension( 47 static const FilePath::StringType kDecodedDataExtension(
48 FILE_PATH_LITERAL(".md5sum")); 48 FILE_PATH_LITERAL(".md5sum"));
49 return FilePath(path.value() + kDecodedDataExtension); 49 return FilePath(path.value() + kDecodedDataExtension);
50 } 50 }
51 51
52 #if defined(CALCULATE_MD5_SUMS) 52 #if defined(CALCULATE_MD5_SUMS)
53 void SaveMD5Sum(const std::wstring& path, const WebKit::WebImage& web_image) { 53 void SaveMD5Sum(const std::wstring& path, const WebKit::WebImage& web_image) {
54 // Calculate MD5 sum. 54 // Calculate MD5 sum.
55 MD5Digest digest; 55 base::MD5Digest digest;
56 web_image.getSkBitmap().lockPixels(); 56 web_image.getSkBitmap().lockPixels();
57 MD5Sum(web_image.getSkBitmap().getPixels(), 57 base::MD5Sum(web_image.getSkBitmap().getPixels(),
58 web_image.getSkBitmap().width() * web_image.getSkBitmap().height() * 58 web_image.getSkBitmap().width() * web_image.getSkBitmap().height() *
59 sizeof(uint32_t), 59 sizeof(uint32_t),
60 &digest); 60 &digest);
61 61
62 // Write sum to disk. 62 // Write sum to disk.
63 int bytes_written = file_util::WriteFile(path, 63 int bytes_written = file_util::WriteFile(path,
64 reinterpret_cast<const char*>(&digest), sizeof digest); 64 reinterpret_cast<const char*>(&digest), sizeof digest);
65 ASSERT_EQ(sizeof digest, bytes_written); 65 ASSERT_EQ(sizeof digest, bytes_written);
66 web_image.getSkBitmap().unlockPixels(); 66 web_image.getSkBitmap().unlockPixels();
67 } 67 }
68 #endif 68 #endif
69 69
70 #if !defined(CALCULATE_MD5_SUMS) 70 #if !defined(CALCULATE_MD5_SUMS)
71 void VerifyImage(const WebKit::WebImageDecoder& decoder, 71 void VerifyImage(const WebKit::WebImageDecoder& decoder,
72 const FilePath& path, 72 const FilePath& path,
73 const FilePath& md5_sum_path, 73 const FilePath& md5_sum_path,
74 size_t frame_index) { 74 size_t frame_index) {
75 // Make sure decoding can complete successfully. 75 // Make sure decoding can complete successfully.
76 EXPECT_TRUE(decoder.isSizeAvailable()) << path.value(); 76 EXPECT_TRUE(decoder.isSizeAvailable()) << path.value();
77 EXPECT_GE(decoder.frameCount(), frame_index) << path.value(); 77 EXPECT_GE(decoder.frameCount(), frame_index) << path.value();
78 EXPECT_TRUE(decoder.isFrameCompleteAtIndex(frame_index)) << path.value(); 78 EXPECT_TRUE(decoder.isFrameCompleteAtIndex(frame_index)) << path.value();
79 EXPECT_FALSE(decoder.isFailed()); 79 EXPECT_FALSE(decoder.isFailed());
80 80
81 // Calculate MD5 sum. 81 // Calculate MD5 sum.
82 MD5Digest actual_digest; 82 base::MD5Digest actual_digest;
83 WebKit::WebImage web_image = decoder.getFrameAtIndex(frame_index); 83 WebKit::WebImage web_image = decoder.getFrameAtIndex(frame_index);
84 web_image.getSkBitmap().lockPixels(); 84 web_image.getSkBitmap().lockPixels();
85 MD5Sum(web_image.getSkBitmap().getPixels(), 85 base::MD5Sum(web_image.getSkBitmap().getPixels(),
86 web_image.getSkBitmap().width() * web_image.getSkBitmap().height() * 86 web_image.getSkBitmap().width() * web_image.getSkBitmap().height() *
87 sizeof(uint32_t), 87 sizeof(uint32_t),
88 &actual_digest); 88 &actual_digest);
89 89
90 // Read the MD5 sum off disk. 90 // Read the MD5 sum off disk.
91 std::string file_bytes; 91 std::string file_bytes;
92 file_util::ReadFileToString(md5_sum_path, &file_bytes); 92 file_util::ReadFileToString(md5_sum_path, &file_bytes);
93 MD5Digest expected_digest; 93 base::MD5Digest expected_digest;
94 ASSERT_EQ(sizeof expected_digest, file_bytes.size()) << path.value(); 94 ASSERT_EQ(sizeof expected_digest, file_bytes.size()) << path.value();
95 memcpy(&expected_digest, file_bytes.data(), sizeof expected_digest); 95 memcpy(&expected_digest, file_bytes.data(), sizeof expected_digest);
96 96
97 // Verify that the sums are the same. 97 // Verify that the sums are the same.
98 EXPECT_EQ(0, memcmp(&expected_digest, &actual_digest, sizeof(MD5Digest))) 98 EXPECT_EQ(0,
99 memcmp(&expected_digest, &actual_digest, sizeof(base::MD5Digest)))
99 << path.value(); 100 << path.value();
100 web_image.getSkBitmap().unlockPixels(); 101 web_image.getSkBitmap().unlockPixels();
101 } 102 }
102 #endif 103 #endif
103 104
104 void ImageDecoderTest::SetUp() { 105 void ImageDecoderTest::SetUp() {
105 FilePath data_dir; 106 FilePath data_dir;
106 ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir)); 107 ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir));
107 data_dir_ = data_dir.AppendASCII("webkit"). 108 data_dir_ = data_dir.AppendASCII("webkit").
108 AppendASCII("data"). 109 AppendASCII("data").
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 // Since WebImage does not expose get data by frame, get the size 207 // Since WebImage does not expose get data by frame, get the size
207 // through decoder and pass it to fromData so that the closest 208 // through decoder and pass it to fromData so that the closest
208 // image dats to the size is returned. 209 // image dats to the size is returned.
209 WebKit::WebSize size(decoder->getImage(desired_frame_index).size()); 210 WebKit::WebSize size(decoder->getImage(desired_frame_index).size());
210 const WebKit::WebImage& image = WebKit::WebImage::fromData(data, size); 211 const WebKit::WebImage& image = WebKit::WebImage::fromData(data, size);
211 SaveMD5Sum(md5_sum_path.value(), image); 212 SaveMD5Sum(md5_sum_path.value(), image);
212 #else 213 #else
213 VerifyImage(*decoder, image_path, md5_sum_path, desired_frame_index); 214 VerifyImage(*decoder, image_path, md5_sum_path, desired_frame_index);
214 #endif 215 #endif
215 } 216 }
OLDNEW
« no previous file with comments | « net/socket/web_socket_server_socket.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698