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 "base/threading/sequenced_worker_pool.h" |
8 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
9 #include "chrome/common/chrome_utility_messages.h" | 10 #include "chrome/common/chrome_utility_messages.h" |
10 #include "content/public/browser/browser_thread.h" | 11 #include "content/public/browser/browser_thread.h" |
11 #include "content/public/browser/utility_process_host.h" | 12 #include "content/public/browser/utility_process_host.h" |
12 | 13 |
13 using content::BrowserThread; | 14 using content::BrowserThread; |
14 using content::UtilityProcessHost; | 15 using content::UtilityProcessHost; |
15 | 16 |
16 ImageDecoder::ImageDecoder(Delegate* delegate, | 17 ImageDecoder::ImageDecoder(Delegate* delegate, |
17 const std::string& image_data, | 18 const std::string& image_data, |
18 ImageCodec image_codec) | 19 ImageCodec image_codec) |
19 : delegate_(delegate), | 20 : delegate_(delegate), |
20 image_data_(image_data.begin(), image_data.end()), | 21 image_data_(image_data.begin(), image_data.end()), |
21 image_codec_(image_codec), | 22 image_codec_(image_codec), |
22 target_thread_id_(BrowserThread::UI) { | 23 target_thread_id_(BrowserThread::UI) { |
23 } | 24 } |
24 | 25 |
25 ImageDecoder::~ImageDecoder() {} | 26 ImageDecoder::~ImageDecoder() {} |
26 | 27 |
27 void ImageDecoder::Start() { | 28 void ImageDecoder::Start() { |
28 if (!BrowserThread::GetCurrentThreadIdentifier(&target_thread_id_)) { | 29 if (!BrowserThread::GetCurrentThreadIdentifier(&target_thread_id_)) { |
29 NOTREACHED(); | 30 NOTREACHED(); |
30 return; | 31 return; |
31 } | 32 } |
32 BrowserThread::PostTask( | 33 BrowserThread::PostTask( |
33 BrowserThread::IO, FROM_HERE, | 34 BrowserThread::IO, FROM_HERE, |
34 base::Bind(&ImageDecoder::DecodeImageInSandbox, this, image_data_)); | 35 base::Bind(&ImageDecoder::DecodeImageInSandbox, this, image_data_)); |
35 } | 36 } |
36 | 37 |
| 38 void ImageDecoder::Start(std::string sequence_token_name) { |
| 39 if (sequence_token_name.empty()) { |
| 40 NOTREACHED(); |
| 41 return; |
| 42 } |
| 43 sequence_token_name_ = sequence_token_name; |
| 44 BrowserThread::PostTask( |
| 45 BrowserThread::IO, FROM_HERE, |
| 46 base::Bind(&ImageDecoder::DecodeImageInSandbox, this, image_data_)); |
| 47 } |
| 48 |
37 bool ImageDecoder::OnMessageReceived(const IPC::Message& message) { | 49 bool ImageDecoder::OnMessageReceived(const IPC::Message& message) { |
38 bool handled = true; | 50 bool handled = true; |
39 IPC_BEGIN_MESSAGE_MAP(ImageDecoder, message) | 51 IPC_BEGIN_MESSAGE_MAP(ImageDecoder, message) |
40 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Succeeded, | 52 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Succeeded, |
41 OnDecodeImageSucceeded) | 53 OnDecodeImageSucceeded) |
42 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Failed, | 54 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Failed, |
43 OnDecodeImageFailed) | 55 OnDecodeImageFailed) |
44 IPC_MESSAGE_UNHANDLED(handled = false) | 56 IPC_MESSAGE_UNHANDLED(handled = false) |
45 IPC_END_MESSAGE_MAP() | 57 IPC_END_MESSAGE_MAP() |
46 return handled; | 58 return handled; |
47 } | 59 } |
48 | 60 |
| 61 bool ImageDecoder::CalledOnValidThreadOrWorkerThread() { |
| 62 if (sequence_token_name_.empty()) { |
| 63 return BrowserThread::CurrentlyOn(target_thread_id_); |
| 64 } else { |
| 65 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); |
| 66 base::SequencedWorkerPool::SequenceToken sequence_token = pool-> |
| 67 GetNamedSequenceToken(sequence_token_name_); |
| 68 return pool->IsRunningSequenceOnCurrentThread(sequence_token); |
| 69 } |
| 70 } |
| 71 |
49 void ImageDecoder::OnDecodeImageSucceeded(const SkBitmap& decoded_image) { | 72 void ImageDecoder::OnDecodeImageSucceeded(const SkBitmap& decoded_image) { |
50 DCHECK(BrowserThread::CurrentlyOn(target_thread_id_)); | 73 DCHECK(CalledOnValidThreadOrWorkerThread()); |
51 if (delegate_) | 74 if (delegate_) |
52 delegate_->OnImageDecoded(this, decoded_image); | 75 delegate_->OnImageDecoded(this, decoded_image); |
53 } | 76 } |
54 | 77 |
55 void ImageDecoder::OnDecodeImageFailed() { | 78 void ImageDecoder::OnDecodeImageFailed() { |
56 DCHECK(BrowserThread::CurrentlyOn(target_thread_id_)); | 79 DCHECK(CalledOnValidThreadOrWorkerThread()); |
57 if (delegate_) | 80 if (delegate_) |
58 delegate_->OnDecodeImageFailed(this); | 81 delegate_->OnDecodeImageFailed(this); |
59 } | 82 } |
60 | 83 |
61 void ImageDecoder::DecodeImageInSandbox( | 84 void ImageDecoder::DecodeImageInSandbox( |
62 const std::vector<unsigned char>& image_data) { | 85 const std::vector<unsigned char>& image_data) { |
63 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 86 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
64 UtilityProcessHost* utility_process_host = UtilityProcessHost::Create( | 87 UtilityProcessHost* utility_process_host; |
65 this, BrowserThread::GetMessageLoopProxyForThread(target_thread_id_)); | 88 if (sequence_token_name_.empty()) { |
| 89 utility_process_host = UtilityProcessHost::Create( |
| 90 this, BrowserThread::GetMessageLoopProxyForThread(target_thread_id_)); |
| 91 } else { |
| 92 base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); |
| 93 base::SequencedWorkerPool::SequenceToken sequence_token = pool-> |
| 94 GetNamedSequenceToken(sequence_token_name_); |
| 95 utility_process_host = UtilityProcessHost::Create( |
| 96 this, pool->GetSequencedTaskRunner(sequence_token).get()); |
| 97 } |
66 utility_process_host->EnableZygote(); | 98 utility_process_host->EnableZygote(); |
67 if (image_codec_ == ROBUST_JPEG_CODEC) { | 99 if (image_codec_ == ROBUST_JPEG_CODEC) { |
68 utility_process_host->Send( | 100 utility_process_host->Send( |
69 new ChromeUtilityMsg_RobustJPEGDecodeImage(image_data)); | 101 new ChromeUtilityMsg_RobustJPEGDecodeImage(image_data)); |
70 } else { | 102 } else { |
71 utility_process_host->Send(new ChromeUtilityMsg_DecodeImage(image_data)); | 103 utility_process_host->Send(new ChromeUtilityMsg_DecodeImage(image_data)); |
72 } | 104 } |
73 } | 105 } |
OLD | NEW |