OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/chromeos/login/users/avatar/user_image_loader.h" | 5 #include "chrome/browser/chromeos/login/users/avatar/user_image_loader.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 24 matching lines...) Expand all Loading... | |
35 ImageDecoder::ImageCodec image_codec, | 35 ImageDecoder::ImageCodec image_codec, |
36 scoped_refptr<base::SequencedTaskRunner> background_task_runner) | 36 scoped_refptr<base::SequencedTaskRunner> background_task_runner) |
37 : foreground_task_runner_(base::MessageLoopProxy::current()), | 37 : foreground_task_runner_(base::MessageLoopProxy::current()), |
38 background_task_runner_(background_task_runner), | 38 background_task_runner_(background_task_runner), |
39 image_codec_(image_codec) { | 39 image_codec_(image_codec) { |
40 } | 40 } |
41 | 41 |
42 UserImageLoader::~UserImageLoader() { | 42 UserImageLoader::~UserImageLoader() { |
43 } | 43 } |
44 | 44 |
45 UserImageLoader::ImageRequest::ImageRequest(const ImageInfo& image_info, | |
46 const std::string& image_data, | |
47 UserImageLoader* user_image_loader) | |
48 : Delegate(user_image_loader->background_task_runner_), | |
49 image_info_(image_info), | |
50 image_data_(image_data.begin(), image_data.end()), | |
51 user_image_loader_(user_image_loader) { | |
52 } | |
53 | |
54 UserImageLoader::ImageRequest::~ImageRequest() { | |
55 } | |
56 | |
45 void UserImageLoader::Start(const std::string& filepath, | 57 void UserImageLoader::Start(const std::string& filepath, |
46 int pixels_per_side, | 58 int pixels_per_side, |
47 const LoadedCallback& loaded_cb) { | 59 const LoadedCallback& loaded_cb) { |
48 background_task_runner_->PostTask( | 60 background_task_runner_->PostTask( |
49 FROM_HERE, | 61 FROM_HERE, |
50 base::Bind(&UserImageLoader::ReadAndDecodeImage, | 62 base::Bind(&UserImageLoader::ReadAndDecodeImage, |
51 this, | 63 this, |
52 ImageInfo(filepath, pixels_per_side, loaded_cb))); | 64 ImageInfo(filepath, pixels_per_side, loaded_cb))); |
53 } | 65 } |
54 | 66 |
(...skipping 17 matching lines...) Expand all Loading... | |
72 | 84 |
73 // In case ReadFileToString() fails, |data| is empty and DecodeImage() calls | 85 // In case ReadFileToString() fails, |data| is empty and DecodeImage() calls |
74 // back to OnDecodeImageFailed(). | 86 // back to OnDecodeImageFailed(). |
75 DecodeImage(data.Pass(), image_info); | 87 DecodeImage(data.Pass(), image_info); |
76 } | 88 } |
77 | 89 |
78 void UserImageLoader::DecodeImage(const scoped_ptr<std::string> data, | 90 void UserImageLoader::DecodeImage(const scoped_ptr<std::string> data, |
79 const ImageInfo& image_info) { | 91 const ImageInfo& image_info) { |
80 DCHECK(background_task_runner_->RunsTasksOnCurrentThread()); | 92 DCHECK(background_task_runner_->RunsTasksOnCurrentThread()); |
81 | 93 |
82 scoped_refptr<ImageDecoder> image_decoder = | 94 ImageRequest* image_request = new ImageRequest(image_info, *data, this); |
dcheng
2015/03/20 00:14:45
Where is this freed?
Theresa
2015/03/20 19:09:01
It wasn't. I fixed it to free in OnDecodeImageFail
| |
83 new ImageDecoder(this, *data, image_codec_); | 95 ImageDecoder::Start(image_request, *data, image_codec_, false); |
84 image_info_map_.insert(std::make_pair(image_decoder.get(), image_info)); | |
85 image_decoder->Start(background_task_runner_); | |
86 } | 96 } |
87 | 97 |
88 void UserImageLoader::OnImageDecoded(const ImageDecoder* decoder, | 98 void UserImageLoader::ImageRequest::OnImageDecoded( |
89 const SkBitmap& decoded_image) { | 99 const SkBitmap& decoded_image) { |
90 DCHECK(background_task_runner_->RunsTasksOnCurrentThread()); | 100 DCHECK(task_runner()->RunsTasksOnCurrentThread()); |
91 | 101 |
92 ImageInfoMap::iterator it = image_info_map_.find(decoder); | 102 const int target_size = image_info_.pixels_per_side; |
93 if (it == image_info_map_.end()) { | |
94 NOTREACHED(); | |
95 return; | |
96 } | |
97 const std::string file_path = it->second.file_path; | |
98 const int target_size = it->second.pixels_per_side; | |
99 const LoadedCallback loaded_cb = it->second.loaded_cb; | |
100 image_info_map_.erase(it); | |
101 | |
102 SkBitmap final_image = decoded_image; | 103 SkBitmap final_image = decoded_image; |
103 | 104 |
104 if (target_size > 0) { | 105 if (target_size > 0) { |
105 // Auto crop the image, taking the largest square in the center. | 106 // Auto crop the image, taking the largest square in the center. |
106 int pixels_per_side = | 107 int pixels_per_side = |
107 std::min(decoded_image.width(), decoded_image.height()); | 108 std::min(decoded_image.width(), decoded_image.height()); |
108 int x = (decoded_image.width() - pixels_per_side) / 2; | 109 int x = (decoded_image.width() - pixels_per_side) / 2; |
109 int y = (decoded_image.height() - pixels_per_side) / 2; | 110 int y = (decoded_image.height() - pixels_per_side) / 2; |
110 SkBitmap cropped_image = SkBitmapOperations::CreateTiledBitmap( | 111 SkBitmap cropped_image = SkBitmapOperations::CreateTiledBitmap( |
111 decoded_image, x, y, pixels_per_side, pixels_per_side); | 112 decoded_image, x, y, pixels_per_side, pixels_per_side); |
112 if (pixels_per_side > target_size) { | 113 if (pixels_per_side > target_size) { |
113 // Also downsize the image to save space and memory. | 114 // Also downsize the image to save space and memory. |
114 final_image = | 115 final_image = |
115 skia::ImageOperations::Resize(cropped_image, | 116 skia::ImageOperations::Resize(cropped_image, |
116 skia::ImageOperations::RESIZE_LANCZOS3, | 117 skia::ImageOperations::RESIZE_LANCZOS3, |
117 target_size, | 118 target_size, |
118 target_size); | 119 target_size); |
119 } else { | 120 } else { |
120 final_image = cropped_image; | 121 final_image = cropped_image; |
121 } | 122 } |
122 } | 123 } |
123 // Make the SkBitmap immutable as we won't modify it. This is important | 124 // Make the SkBitmap immutable as we won't modify it. This is important |
124 // because otherwise it gets duplicated during painting, wasting memory. | 125 // because otherwise it gets duplicated during painting, wasting memory. |
125 final_image.setImmutable(); | 126 final_image.setImmutable(); |
126 gfx::ImageSkia final_image_skia = | 127 gfx::ImageSkia final_image_skia = |
127 gfx::ImageSkia::CreateFrom1xBitmap(final_image); | 128 gfx::ImageSkia::CreateFrom1xBitmap(final_image); |
128 final_image_skia.MakeThreadSafe(); | 129 final_image_skia.MakeThreadSafe(); |
129 user_manager::UserImage user_image(final_image_skia, | 130 user_manager::UserImage user_image(final_image_skia, image_data_); |
130 decoder->get_image_data()); | 131 user_image.set_file_path(image_info_.file_path); |
131 user_image.set_file_path(file_path); | 132 if (user_image_loader_->image_codec_ == ImageDecoder::ROBUST_JPEG_CODEC) |
132 if (image_codec_ == ImageDecoder::ROBUST_JPEG_CODEC) | |
133 user_image.MarkAsSafe(); | 133 user_image.MarkAsSafe(); |
134 foreground_task_runner_->PostTask(FROM_HERE, | 134 user_image_loader_->foreground_task_runner_->PostTask( |
135 base::Bind(loaded_cb, user_image)); | 135 FROM_HERE, base::Bind(image_info_.loaded_cb, user_image)); |
136 } | 136 } |
137 | 137 |
138 void UserImageLoader::OnDecodeImageFailed(const ImageDecoder* decoder) { | 138 void UserImageLoader::ImageRequest::OnDecodeImageFailed() { |
139 DCHECK(background_task_runner_->RunsTasksOnCurrentThread()); | 139 DCHECK(task_runner()->RunsTasksOnCurrentThread()); |
140 | 140 user_image_loader_->foreground_task_runner_->PostTask( |
141 ImageInfoMap::iterator it = image_info_map_.find(decoder); | 141 FROM_HERE, base::Bind(image_info_.loaded_cb, user_manager::UserImage())); |
142 if (it == image_info_map_.end()) { | |
143 NOTREACHED(); | |
144 return; | |
145 } | |
146 const LoadedCallback loaded_cb = it->second.loaded_cb; | |
147 image_info_map_.erase(it); | |
148 | |
149 foreground_task_runner_->PostTask( | |
150 FROM_HERE, base::Bind(loaded_cb, user_manager::UserImage())); | |
151 } | 142 } |
152 | 143 |
153 } // namespace chromeos | 144 } // namespace chromeos |
OLD | NEW |