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 ImageDecoder::ImageDecoder(Delegate* delegate, |
17 const std::string& image_data, | 17 const std::string& image_data, |
18 ImageCodec image_codec) | 18 ImageCodec image_codec) |
19 : delegate_(delegate), | 19 : delegate_(delegate), |
20 image_data_(image_data.begin(), image_data.end()), | 20 image_data_(image_data.begin(), image_data.end()), |
21 image_codec_(image_codec), | 21 image_codec_(image_codec), |
22 target_thread_id_(BrowserThread::UI) { | 22 target_thread_id_(BrowserThread::UI), |
23 decode_on_sequence_worker_thread_(false) { | |
23 } | 24 } |
24 | 25 |
25 ImageDecoder::~ImageDecoder() {} | 26 ImageDecoder::~ImageDecoder() {} |
26 | 27 |
27 void ImageDecoder::Start() { | 28 void ImageDecoder::Start() { |
29 decode_on_sequence_worker_thread_ = false; | |
28 if (!BrowserThread::GetCurrentThreadIdentifier(&target_thread_id_)) { | 30 if (!BrowserThread::GetCurrentThreadIdentifier(&target_thread_id_)) { |
29 NOTREACHED(); | 31 NOTREACHED(); |
30 return; | 32 return; |
31 } | 33 } |
32 BrowserThread::PostTask( | 34 BrowserThread::PostTask( |
33 BrowserThread::IO, FROM_HERE, | 35 BrowserThread::IO, FROM_HERE, |
34 base::Bind(&ImageDecoder::DecodeImageInSandbox, this, image_data_)); | 36 base::Bind(&ImageDecoder::DecodeImageInSandbox, this, image_data_)); |
35 } | 37 } |
36 | 38 |
39 void ImageDecoder::Start( | |
40 const base::SequencedWorkerPool::SequenceToken& sequence_token) { | |
Joao da Silva
2013/01/21 08:07:39
Why not have a single Start() that gets a TaskRunn
bshe
2013/01/21 22:53:07
Good idea!
We only have one Start function now.
O
| |
41 sequence_token_ = sequence_token; | |
42 decode_on_sequence_worker_thread_ = true; | |
43 BrowserThread::PostTask( | |
44 BrowserThread::IO, FROM_HERE, | |
45 base::Bind(&ImageDecoder::DecodeImageInSandbox, this, image_data_)); | |
Joao da Silva
2013/01/21 08:07:39
nit: indent (4 spaces)
bshe
2013/01/21 22:53:07
This is an argument of function PostTask, same as
| |
46 } | |
47 | |
37 bool ImageDecoder::OnMessageReceived(const IPC::Message& message) { | 48 bool ImageDecoder::OnMessageReceived(const IPC::Message& message) { |
38 bool handled = true; | 49 bool handled = true; |
39 IPC_BEGIN_MESSAGE_MAP(ImageDecoder, message) | 50 IPC_BEGIN_MESSAGE_MAP(ImageDecoder, message) |
40 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Succeeded, | 51 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Succeeded, |
41 OnDecodeImageSucceeded) | 52 OnDecodeImageSucceeded) |
42 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Failed, | 53 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Failed, |
43 OnDecodeImageFailed) | 54 OnDecodeImageFailed) |
44 IPC_MESSAGE_UNHANDLED(handled = false) | 55 IPC_MESSAGE_UNHANDLED(handled = false) |
45 IPC_END_MESSAGE_MAP() | 56 IPC_END_MESSAGE_MAP() |
46 return handled; | 57 return handled; |
47 } | 58 } |
48 | 59 |
60 bool ImageDecoder::CalledOnValidThreadOrWorkerThread() { | |
61 if (decode_on_sequence_worker_thread_) { | |
62 return BrowserThread::GetBlockingPool()-> | |
63 IsRunningSequenceOnCurrentThread(sequence_token_); | |
64 } else { | |
65 return BrowserThread::CurrentlyOn(target_thread_id_); | |
66 } | |
67 } | |
68 | |
49 void ImageDecoder::OnDecodeImageSucceeded(const SkBitmap& decoded_image) { | 69 void ImageDecoder::OnDecodeImageSucceeded(const SkBitmap& decoded_image) { |
50 DCHECK(BrowserThread::CurrentlyOn(target_thread_id_)); | 70 DCHECK(CalledOnValidThreadOrWorkerThread()); |
51 if (delegate_) | 71 if (delegate_) |
52 delegate_->OnImageDecoded(this, decoded_image); | 72 delegate_->OnImageDecoded(this, decoded_image); |
53 } | 73 } |
54 | 74 |
55 void ImageDecoder::OnDecodeImageFailed() { | 75 void ImageDecoder::OnDecodeImageFailed() { |
56 DCHECK(BrowserThread::CurrentlyOn(target_thread_id_)); | 76 DCHECK(CalledOnValidThreadOrWorkerThread()); |
57 if (delegate_) | 77 if (delegate_) |
58 delegate_->OnDecodeImageFailed(this); | 78 delegate_->OnDecodeImageFailed(this); |
59 } | 79 } |
60 | 80 |
61 void ImageDecoder::DecodeImageInSandbox( | 81 void ImageDecoder::DecodeImageInSandbox( |
62 const std::vector<unsigned char>& image_data) { | 82 const std::vector<unsigned char>& image_data) { |
63 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 83 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
64 UtilityProcessHost* utility_process_host = UtilityProcessHost::Create( | 84 UtilityProcessHost* utility_process_host; |
65 this, BrowserThread::GetMessageLoopProxyForThread(target_thread_id_)); | 85 if (decode_on_sequence_worker_thread_) { |
86 utility_process_host = UtilityProcessHost::Create( | |
87 this, BrowserThread::GetBlockingPool()->GetSequencedTaskRunner( | |
88 sequence_token_).get()); | |
89 } else { | |
90 utility_process_host = UtilityProcessHost::Create( | |
91 this, BrowserThread::GetMessageLoopProxyForThread(target_thread_id_)); | |
92 } | |
66 utility_process_host->EnableZygote(); | 93 utility_process_host->EnableZygote(); |
67 if (image_codec_ == ROBUST_JPEG_CODEC) { | 94 if (image_codec_ == ROBUST_JPEG_CODEC) { |
68 utility_process_host->Send( | 95 utility_process_host->Send( |
69 new ChromeUtilityMsg_RobustJPEGDecodeImage(image_data)); | 96 new ChromeUtilityMsg_RobustJPEGDecodeImage(image_data)); |
70 } else { | 97 } else { |
71 utility_process_host->Send(new ChromeUtilityMsg_DecodeImage(image_data)); | 98 utility_process_host->Send(new ChromeUtilityMsg_DecodeImage(image_data)); |
72 } | 99 } |
73 } | 100 } |
OLD | NEW |