OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/image_decoder.h" | 5 #include "chrome/browser/image_decoder.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
9 #include "chrome/common/chrome_utility_messages.h" | 9 #include "chrome/common/chrome_utility_messages.h" |
10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
11 #include "content/public/browser/utility_process_host.h" | 11 #include "content/public/browser/utility_process_host.h" |
12 | 12 |
13 using content::BrowserThread; | 13 using content::BrowserThread; |
14 using content::UtilityProcessHost; | 14 using content::UtilityProcessHost; |
15 | 15 |
16 ImageDecoder::ImageDecoder(Delegate* delegate, | 16 // static, Leaky to allow access from any thread. |
17 const std::string& image_data, | 17 base::LazyInstance<ImageDecoder>::Leaky image_decoder_instance_ = |
18 ImageCodec image_codec) | 18 LAZY_INSTANCE_INITIALIZER; |
19 : delegate_(delegate), | 19 |
20 image_data_(image_data.begin(), image_data.end()), | 20 // static |
21 image_codec_(image_codec), | 21 ImageDecoder* ImageDecoder::GetInstance() { |
22 task_runner_(NULL), | 22 return image_decoder_instance_.Pointer(); |
23 shrink_to_fit_(false) { | |
24 } | 23 } |
25 | 24 |
26 ImageDecoder::ImageDecoder(Delegate* delegate, | 25 ImageDecoder::ImageDecoder() : image_decoder_impl_(new ImageDecoderImpl()) { |
27 const std::vector<char>& image_data, | |
28 ImageCodec image_codec) | |
29 : delegate_(delegate), | |
30 image_data_(image_data.begin(), image_data.end()), | |
31 image_codec_(image_codec), | |
32 task_runner_(NULL), | |
33 shrink_to_fit_(false) { | |
34 } | 26 } |
35 | 27 |
36 ImageDecoder::~ImageDecoder() {} | 28 ImageDecoder::~ImageDecoder() { |
37 | |
38 void ImageDecoder::Start(scoped_refptr<base::SequencedTaskRunner> task_runner) { | |
39 task_runner_ = task_runner; | |
40 BrowserThread::PostTask( | |
41 BrowserThread::IO, FROM_HERE, | |
42 base::Bind(&ImageDecoder::DecodeImageInSandbox, this, image_data_)); | |
43 } | 29 } |
44 | 30 |
45 bool ImageDecoder::OnMessageReceived(const IPC::Message& message) { | 31 ImageDecoder::ImageDecoderImpl::RequestInfo::RequestInfo( |
32 Delegate* delegate, | |
33 scoped_refptr<base::SequencedTaskRunner> task_runner) | |
34 : delegate(delegate), task_runner(task_runner) { | |
35 } | |
36 | |
37 ImageDecoder::ImageDecoderImpl::RequestInfo::~RequestInfo() { | |
38 } | |
39 | |
40 void ImageDecoder::Start(Delegate* delegate, | |
41 const std::string& image_data, | |
42 ImageCodec image_codec, | |
43 scoped_refptr<base::SequencedTaskRunner> task_runner, | |
44 bool shrink_to_fit) { | |
45 DCHECK(task_runner); | |
46 DCHECK(delegate); | |
47 image_decoder_impl_->Start(delegate, image_data, image_codec, task_runner, | |
48 shrink_to_fit); | |
49 } | |
50 | |
51 // ImageDecoder::ImageDecoderImpl Methods | |
52 | |
53 ImageDecoder::ImageDecoderImpl::ImageDecoderImpl() | |
54 : delegate_id_counter_(0), | |
55 last_request_(base::TimeTicks::Now()), | |
56 batch_mode_started_(false) { | |
57 } | |
58 | |
59 ImageDecoder::ImageDecoderImpl::~ImageDecoderImpl() { | |
60 } | |
61 | |
62 void ImageDecoder::ImageDecoderImpl::Start( | |
63 Delegate* delegate, | |
64 const std::string& image_data, | |
65 ImageCodec image_codec, | |
66 scoped_refptr<base::SequencedTaskRunner> task_runner, | |
67 bool shrink_to_fit) { | |
68 if (!batch_mode_started_) { | |
dcheng
2015/03/10 15:49:12
Would it make the code simpler if we did something
Theresa
2015/03/10 23:50:54
Yes, that would be simpler. I shuffled things arou
| |
69 task_runner_at_start_ = task_runner; | |
70 BrowserThread::PostTask( | |
71 BrowserThread::IO, FROM_HERE, | |
72 base::Bind(&ImageDecoder::ImageDecoderImpl::StartBatchMode, this, | |
73 delegate, image_data, image_codec, shrink_to_fit)); | |
74 return; | |
75 } | |
76 | |
77 last_request_ = base::TimeTicks::Now(); | |
78 RequestInfo* request_info = new RequestInfo(delegate, task_runner); | |
79 request_info_id_map_.insert( | |
80 std::pair<int, RequestInfo*>(delegate_id_counter_, request_info)); | |
81 | |
82 BrowserThread::PostTask( | |
83 BrowserThread::IO, FROM_HERE, | |
84 base::Bind( | |
85 &ImageDecoder::ImageDecoderImpl::DecodeImageInSandbox, this, delegate, | |
86 std::vector<unsigned char>(image_data.begin(), image_data.end()), | |
87 image_codec, shrink_to_fit, delegate_id_counter_)); | |
88 | |
89 ++delegate_id_counter_; | |
90 } | |
91 | |
92 void ImageDecoder::ImageDecoderImpl::StartBatchMode( | |
93 Delegate* delegate, | |
94 const std::string& image_data, | |
95 ImageCodec image_codec, | |
96 bool shrink_to_fit) { | |
97 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
98 utility_process_host_ = | |
99 UtilityProcessHost::Create(this, base::MessageLoopProxy::current().get()) | |
100 ->AsWeakPtr(); | |
101 utility_process_host_->StartBatchMode(); | |
102 batch_mode_started_ = true; | |
103 PostDelayedStopBatchModeTask(); | |
104 Start(delegate, image_data, image_codec, task_runner_at_start_, | |
105 shrink_to_fit); | |
106 } | |
107 | |
108 void ImageDecoder::ImageDecoderImpl::PostDelayedStopBatchModeTask() { | |
109 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
110 BrowserThread::PostDelayedTask( | |
111 BrowserThread::IO, FROM_HERE, | |
112 base::Bind(&ImageDecoder::ImageDecoderImpl::StopBatchMode, this), | |
113 base::TimeDelta::FromSeconds(kBatchModeTimeoutSeconds)); | |
114 } | |
115 | |
116 void ImageDecoder::ImageDecoderImpl::StopBatchMode() { | |
117 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | |
118 if ((base::TimeTicks::Now() - last_request_) < | |
119 base::TimeDelta::FromSeconds(kBatchModeTimeoutSeconds)) { | |
120 PostDelayedStopBatchModeTask(); | |
121 return; | |
122 } | |
123 | |
124 if (utility_process_host_.get()) { | |
dcheng
2015/03/10 15:49:12
Nit: .get() should be unnecessary to check the nul
Theresa
2015/03/10 23:50:54
Done.
| |
125 utility_process_host_->EndBatchMode(); | |
126 utility_process_host_.reset(); | |
127 } | |
128 batch_mode_started_ = false; | |
129 } | |
130 | |
131 bool ImageDecoder::ImageDecoderImpl::OnMessageReceived( | |
132 const IPC::Message& message) { | |
46 bool handled = true; | 133 bool handled = true; |
47 IPC_BEGIN_MESSAGE_MAP(ImageDecoder, message) | 134 IPC_BEGIN_MESSAGE_MAP(ImageDecoder::ImageDecoderImpl, message) |
48 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Succeeded, | 135 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Succeeded, |
49 OnDecodeImageSucceeded) | 136 OnDecodeImageSucceeded) |
50 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Failed, | 137 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Failed, |
51 OnDecodeImageFailed) | 138 OnDecodeImageFailed) |
52 IPC_MESSAGE_UNHANDLED(handled = false) | 139 IPC_MESSAGE_UNHANDLED(handled = false) |
53 IPC_END_MESSAGE_MAP() | 140 IPC_END_MESSAGE_MAP() |
54 return handled; | 141 return handled; |
55 } | 142 } |
56 | 143 |
57 void ImageDecoder::OnDecodeImageSucceeded(const SkBitmap& decoded_image) { | 144 void ImageDecoder::ImageDecoderImpl::OnDecodeImageSucceeded( |
58 DCHECK(task_runner_->RunsTasksOnCurrentThread()); | 145 const SkBitmap& decoded_image, |
59 if (delegate_) | 146 int id) { |
60 delegate_->OnImageDecoded(this, decoded_image); | 147 if (request_info_id_map_.find(id) != request_info_id_map_.end()) { |
148 RequestInfo* request_info = request_info_id_map_.find(id)->second; | |
dcheng
2015/03/10 15:49:12
Maybe:
auto& entry = request_info_id_map_.find(id)
Theresa
2015/03/10 23:50:54
Acknowledged.
| |
149 request_info->task_runner->PostTask( | |
150 FROM_HERE, | |
151 base::Bind( | |
152 &ImageDecoder::ImageDecoderImpl::NotifyDelegateDecodeSucceeded, | |
153 this, decoded_image, request_info->delegate)); | |
dcheng
2015/03/10 15:49:12
You can eliminate an indirection here, I think. Ju
Theresa
2015/03/10 23:50:54
wrt to the indirection, ref_counted.h complains ab
Theresa
2015/03/12 00:36:32
The first part of this comment, above "Eliminated
| |
154 | |
155 request_info_id_map_.erase(id); | |
156 delete request_info; | |
157 request_info = NULL; | |
dcheng
2015/03/10 15:49:12
Note: we prefer nullptr to NULL in new code.
Theresa
2015/03/10 23:50:54
Done.
| |
158 } | |
61 } | 159 } |
62 | 160 |
63 void ImageDecoder::OnDecodeImageFailed() { | 161 void ImageDecoder::ImageDecoderImpl::OnDecodeImageFailed(int id) { |
64 DCHECK(task_runner_->RunsTasksOnCurrentThread()); | 162 if (request_info_id_map_.find(id) != request_info_id_map_.end()) { |
65 if (delegate_) | 163 RequestInfo* request_info = request_info_id_map_.find(id)->second; |
dcheng
2015/03/10 15:49:12
I think it's OK to just store this directly in the
Theresa
2015/03/10 23:50:54
Acknowledged.
| |
66 delegate_->OnDecodeImageFailed(this); | 164 request_info->task_runner->PostTask( |
165 FROM_HERE, | |
166 base::Bind(&ImageDecoder::ImageDecoderImpl::NotifyDelegateDecodeFailed, | |
167 this, request_info->delegate)); | |
168 | |
169 request_info_id_map_.erase(id); | |
170 delete request_info; | |
171 request_info = NULL; | |
172 } | |
67 } | 173 } |
68 | 174 |
69 void ImageDecoder::DecodeImageInSandbox( | 175 void ImageDecoder::ImageDecoderImpl::NotifyDelegateDecodeSucceeded( |
70 const std::vector<unsigned char>& image_data) { | 176 const SkBitmap& decoded_image, |
177 Delegate* delegate) { | |
178 delegate->OnImageDecoded(decoded_image); | |
179 } | |
180 | |
181 void ImageDecoder::ImageDecoderImpl::NotifyDelegateDecodeFailed( | |
182 Delegate* delegate) { | |
183 delegate->OnDecodeImageFailed(); | |
184 } | |
185 | |
186 void ImageDecoder::ImageDecoderImpl::DecodeImageInSandbox( | |
187 Delegate* delegate, | |
188 const std::vector<unsigned char>& image_data, | |
189 ImageCodec image_codec, | |
190 bool shrink_to_fit, | |
191 int delegate_id) { | |
71 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 192 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
72 UtilityProcessHost* utility_process_host; | 193 if (image_codec == ROBUST_JPEG_CODEC) { |
73 utility_process_host = UtilityProcessHost::Create(this, task_runner_.get()); | 194 utility_process_host_->Send( |
74 if (image_codec_ == ROBUST_JPEG_CODEC) { | 195 new ChromeUtilityMsg_RobustJPEGDecodeImage(image_data, delegate_id)); |
75 utility_process_host->Send( | |
76 new ChromeUtilityMsg_RobustJPEGDecodeImage(image_data)); | |
77 } else { | 196 } else { |
78 utility_process_host->Send( | 197 utility_process_host_->Send(new ChromeUtilityMsg_DecodeImage( |
79 new ChromeUtilityMsg_DecodeImage(image_data, shrink_to_fit_)); | 198 image_data, shrink_to_fit, delegate_id)); |
80 } | 199 } |
81 } | 200 } |
OLD | NEW |