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

Side by Side Diff: chrome/browser/image_decoder.cc

Issue 931993002: Make image_decoder a Leaky LazyInstance (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Refactor webstore_install_helper to use ImageDecoder, remove DecodeBase64 support Created 5 years, 9 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 unified diff | Download patch
OLDNEW
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 void ImageDecoder::Start(Delegate* delegate,
32 const std::string& image_data,
33 ImageCodec image_codec,
34 scoped_refptr<base::SequencedTaskRunner> task_runner,
35 bool shrink_to_fit) {
36 DCHECK(task_runner);
37 DCHECK(delegate);
38 BrowserThread::PostTask(
39 BrowserThread::IO, FROM_HERE,
40 base::Bind(
41 &ImageDecoder::ImageDecoderImpl::DecodeImageInSandbox,
42 image_decoder_impl_, delegate,
43 std::vector<unsigned char>(image_data.begin(), image_data.end()),
44 image_codec, task_runner, shrink_to_fit));
45 }
46
47 // ImageDecoder::ImageDecoderImpl Methods
48
49 ImageDecoder::ImageDecoderImpl::ImageDecoderImpl()
50 : delegate_id_counter_(0),
51 last_request_(base::TimeTicks::Now()),
52 batch_mode_started_(false) {
53 }
54
55 ImageDecoder::ImageDecoderImpl::~ImageDecoderImpl() {
56 }
57
58 ImageDecoder::ImageDecoderImpl::RequestInfo::RequestInfo(
59 Delegate* delegate,
60 scoped_refptr<base::SequencedTaskRunner> task_runner)
61 : delegate(delegate), task_runner(task_runner) {
62 }
63
64 ImageDecoder::ImageDecoderImpl::RequestInfo::~RequestInfo() {
65 }
66
67 void ImageDecoder::ImageDecoderImpl::DecodeImageInSandbox(
68 Delegate* delegate,
69 const std::vector<unsigned char>& image_data,
70 ImageCodec image_codec,
71 scoped_refptr<base::SequencedTaskRunner> task_runner,
72 bool shrink_to_fit) {
73 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
74 if (!batch_mode_started_) {
75 StartBatchMode();
76 }
77
78 last_request_ = base::TimeTicks::Now();
79 RequestInfo* request_info = new RequestInfo(delegate, task_runner);
80 request_info_id_map_.AddWithID(request_info, delegate_id_counter_);
81
82 if (image_codec == ROBUST_JPEG_CODEC) {
83 utility_process_host_->Send(
84 new ChromeUtilityMsg_RobustJPEGDecodeImage(image_data,
85 delegate_id_counter_));
86 } else {
87 utility_process_host_->Send(new ChromeUtilityMsg_DecodeImage(
88 image_data, shrink_to_fit, delegate_id_counter_));
89 }
90
91 ++delegate_id_counter_;
92 }
93
94 void ImageDecoder::ImageDecoderImpl::StartBatchMode() {
95 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
96 utility_process_host_ =
97 UtilityProcessHost::Create(this, base::MessageLoopProxy::current().get())
98 ->AsWeakPtr();
99 utility_process_host_->StartBatchMode();
100 batch_mode_started_ = true;
101 batch_mode_timer_.Start(FROM_HERE,
102 kBatchModeTimeout,
103 this,
104 &ImageDecoder::ImageDecoderImpl::StopBatchMode);
105 }
106
107 void ImageDecoder::ImageDecoderImpl::StopBatchMode() {
108 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
109 if ((base::TimeTicks::Now() - last_request_) < kBatchModeTimeout) {
110 return;
111 }
112
113 if (utility_process_host_) {
114 utility_process_host_->EndBatchMode();
115 utility_process_host_.reset();
116 }
117 batch_mode_started_ = false;
118 batch_mode_timer_.Stop();
119 }
120
121 bool ImageDecoder::ImageDecoderImpl::OnMessageReceived(
122 const IPC::Message& message) {
46 bool handled = true; 123 bool handled = true;
47 IPC_BEGIN_MESSAGE_MAP(ImageDecoder, message) 124 IPC_BEGIN_MESSAGE_MAP(ImageDecoder::ImageDecoderImpl, message)
48 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Succeeded, 125 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Succeeded,
49 OnDecodeImageSucceeded) 126 OnDecodeImageSucceeded)
50 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Failed, 127 IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_DecodeImage_Failed,
51 OnDecodeImageFailed) 128 OnDecodeImageFailed)
52 IPC_MESSAGE_UNHANDLED(handled = false) 129 IPC_MESSAGE_UNHANDLED(handled = false)
53 IPC_END_MESSAGE_MAP() 130 IPC_END_MESSAGE_MAP()
54 return handled; 131 return handled;
55 } 132 }
56 133
57 void ImageDecoder::OnDecodeImageSucceeded(const SkBitmap& decoded_image) { 134 void ImageDecoder::ImageDecoderImpl::OnDecodeImageSucceeded(
58 DCHECK(task_runner_->RunsTasksOnCurrentThread()); 135 const SkBitmap& decoded_image,
59 if (delegate_) 136 int id) {
60 delegate_->OnImageDecoded(this, decoded_image); 137 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
138 if (request_info_id_map_.Lookup(id)) {
139 RequestInfo* request_info = request_info_id_map_.Lookup(id);
140 request_info->task_runner->PostTask(
141 FROM_HERE,
142 base::Bind(&Delegate::OnImageDecoded,
143 base::Unretained(request_info->delegate),
144 decoded_image));
145
146 request_info_id_map_.Remove(id);
147 delete request_info;
148 request_info = nullptr;
149 }
61 } 150 }
62 151
63 void ImageDecoder::OnDecodeImageFailed() { 152 void ImageDecoder::ImageDecoderImpl::OnDecodeImageFailed(int id) {
64 DCHECK(task_runner_->RunsTasksOnCurrentThread()); 153 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
65 if (delegate_) 154 if (request_info_id_map_.Lookup(id)) {
66 delegate_->OnDecodeImageFailed(this); 155 RequestInfo* request_info = request_info_id_map_.Lookup(id);
67 } 156 request_info->task_runner->PostTask(
157 FROM_HERE,
158 base::Bind(&Delegate::OnDecodeImageFailed,
159 base::Unretained(request_info->delegate)));
68 160
69 void ImageDecoder::DecodeImageInSandbox( 161 request_info_id_map_.Remove(id);
70 const std::vector<unsigned char>& image_data) { 162 delete request_info;
71 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 163 request_info = nullptr;
72 UtilityProcessHost* utility_process_host;
73 utility_process_host = UtilityProcessHost::Create(this, task_runner_.get());
74 if (image_codec_ == ROBUST_JPEG_CODEC) {
75 utility_process_host->Send(
76 new ChromeUtilityMsg_RobustJPEGDecodeImage(image_data));
77 } else {
78 utility_process_host->Send(
79 new ChromeUtilityMsg_DecodeImage(image_data, shrink_to_fit_));
80 } 164 }
81 } 165 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698