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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/image_decoder_browsertest.cc

Issue 2177833003: Avoid unnecessary copies in ImageDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change ArcWallpaperHandler to use new API. Created 4 years, 5 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 | « chrome/browser/image_decoder.cc ('k') | components/arc/set_wallpaper_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/image_decoder_browsertest.cc
diff --git a/chrome/browser/image_decoder_browsertest.cc b/chrome/browser/image_decoder_browsertest.cc
index f2fdf537da8e9ec4ca5b5070632a994b822b34d9..602e3a4f6f06650a667a7f3ca21597b4113a78f0 100644
--- a/chrome/browser/image_decoder_browsertest.cc
+++ b/chrome/browser/image_decoder_browsertest.cc
@@ -18,7 +18,7 @@ using content::BrowserThread;
namespace {
-std::string GetValidPngString() {
+std::vector<uint8_t> GetValidPngData() {
// 1x1 PNG. Does not get much smaller than this.
static const char kPngData[] =
"\x89\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52"
@@ -27,12 +27,12 @@ std::string GetValidPngString() {
"\x00\x05\xfe\x02\xfe\xdc\xcc\x59\xe7\x00\x00\x00\x00\x49\x45\x4e"
"\x44\xae\x42\x60\x82";
// Need to specify the buffer size because it contains NULs.
- return std::string(kPngData, sizeof(kPngData) - 1);
+ return std::vector<uint8_t>(kPngData, kPngData + sizeof(kPngData) - 1);
}
#if defined(OS_CHROMEOS)
-std::string GetValidJpgString() {
+std::vector<uint8_t> GetValidJpgData() {
// 1x1 JPG created from the 1x1 PNG above.
static const char kJpgData[] =
"\xFF\xD8\xFF\xE0\x00\x10\x4A\x46\x49\x46\x00\x01\x01\x01\x00\x48"
@@ -54,7 +54,7 @@ std::string GetValidJpgString() {
"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xFF\xDA\x00\x0C\x03\x01"
"\x00\x02\x11\x03\x11\x00\x3F\x00\xA0\x00\xFF\xD9";
// Need to specify the buffer size because it contains NULs.
- return std::string(kJpgData, sizeof(kJpgData) - 1);
+ return std::vector<uint8_t>(kJpgData, kJpgData + sizeof(kJpgData) - 1);
}
#endif // defined(OS_CHROMEOS)
@@ -163,18 +163,31 @@ IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, Basic) {
scoped_refptr<content::MessageLoopRunner> runner =
new content::MessageLoopRunner;
TestImageRequest test_request(runner->QuitClosure());
- ImageDecoder::Start(&test_request, std::string());
+ ImageDecoder::Start(&test_request, std::vector<uint8_t>());
runner->Run();
EXPECT_FALSE(test_request.decode_succeeded());
}
#if defined(OS_CHROMEOS)
+IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, BasicDecodeWithOptionsString) {
+ scoped_refptr<content::MessageLoopRunner> runner =
+ new content::MessageLoopRunner;
+ TestImageRequest test_request(runner->QuitClosure());
+ const std::vector<uint8_t> data = GetValidPngData();
+ ImageDecoder::StartWithOptions(&test_request,
+ std::string(data.begin(), data.end()),
+ ImageDecoder::ROBUST_PNG_CODEC,
+ false /* shrink_to_fit */);
+ runner->Run();
+ EXPECT_TRUE(test_request.decode_succeeded());
+}
+
IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, RobustJpegCodecWithJpegData) {
scoped_refptr<content::MessageLoopRunner> runner =
new content::MessageLoopRunner;
TestImageRequest test_request(runner->QuitClosure());
- ImageDecoder::StartWithOptions(&test_request, GetValidJpgString(),
+ ImageDecoder::StartWithOptions(&test_request, GetValidJpgData(),
ImageDecoder::ROBUST_JPEG_CODEC,
false /* shrink_to_fit */);
runner->Run();
@@ -185,7 +198,7 @@ IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, RobustJpegCodecWithPngData) {
scoped_refptr<content::MessageLoopRunner> runner =
new content::MessageLoopRunner;
TestImageRequest test_request(runner->QuitClosure());
- ImageDecoder::StartWithOptions(&test_request, GetValidPngString(),
+ ImageDecoder::StartWithOptions(&test_request, GetValidPngData(),
ImageDecoder::ROBUST_JPEG_CODEC,
false /* shrink_to_fit */);
runner->Run();
@@ -197,7 +210,7 @@ IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, RobustPngCodecWithPngData) {
scoped_refptr<content::MessageLoopRunner> runner =
new content::MessageLoopRunner;
TestImageRequest test_request(runner->QuitClosure());
- ImageDecoder::StartWithOptions(&test_request, GetValidPngString(),
+ ImageDecoder::StartWithOptions(&test_request, GetValidPngData(),
ImageDecoder::ROBUST_PNG_CODEC,
false /* shrink_to_fit */);
runner->Run();
@@ -208,7 +221,7 @@ IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, RobustPngCodecWithJpegData) {
scoped_refptr<content::MessageLoopRunner> runner =
new content::MessageLoopRunner;
TestImageRequest test_request(runner->QuitClosure());
- ImageDecoder::StartWithOptions(&test_request, GetValidJpgString(),
+ ImageDecoder::StartWithOptions(&test_request, GetValidJpgData(),
ImageDecoder::ROBUST_PNG_CODEC,
false /* shrink_to_fit */);
runner->Run();
@@ -222,7 +235,17 @@ IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, BasicDecode) {
scoped_refptr<content::MessageLoopRunner> runner =
new content::MessageLoopRunner;
TestImageRequest test_request(runner->QuitClosure());
- ImageDecoder::Start(&test_request, GetValidPngString());
+ ImageDecoder::Start(&test_request, GetValidPngData());
+ runner->Run();
+ EXPECT_TRUE(test_request.decode_succeeded());
+}
+
+IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, BasicDecodeString) {
+ scoped_refptr<content::MessageLoopRunner> runner =
+ new content::MessageLoopRunner;
+ TestImageRequest test_request(runner->QuitClosure());
+ const std::vector<uint8_t> data = GetValidPngData();
+ ImageDecoder::Start(&test_request, std::string(data.begin(), data.end()));
runner->Run();
EXPECT_TRUE(test_request.decode_succeeded());
}
@@ -232,7 +255,7 @@ IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, StartAndDestroy) {
new content::MessageLoopRunner;
std::unique_ptr<TestImageRequest> test_request(
new TestImageRequest(runner->QuitClosure()));
- ImageDecoder::Start(test_request.get(), std::string());
+ ImageDecoder::Start(test_request.get(), std::vector<uint8_t>());
test_request.reset();
runner->Run();
}
@@ -248,7 +271,7 @@ IN_PROC_BROWSER_TEST_F(ImageDecoderBrowserTest, StartAndKillProcess) {
scoped_refptr<content::MessageLoopRunner> runner =
new content::MessageLoopRunner;
TestImageRequest test_request(runner->QuitClosure());
- ImageDecoder::Start(&test_request, GetValidPngString());
+ ImageDecoder::Start(&test_request, GetValidPngData());
runner->Run();
if (!test_request.decode_succeeded()) {
// The UI thread won the race. Make sure the utility process did get killed.
« no previous file with comments | « chrome/browser/image_decoder.cc ('k') | components/arc/set_wallpaper_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698