| 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 <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 30 matching lines...) Expand all Loading... |
| 41 | 41 |
| 42 void BindToBrowserConnector(service_manager::mojom::ConnectorRequest request) { | 42 void BindToBrowserConnector(service_manager::mojom::ConnectorRequest request) { |
| 43 if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) { | 43 if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) { |
| 44 content::BrowserThread::PostTask( | 44 content::BrowserThread::PostTask( |
| 45 content::BrowserThread::UI, FROM_HERE, | 45 content::BrowserThread::UI, FROM_HERE, |
| 46 base::Bind(&BindToBrowserConnector, base::Passed(&request))); | 46 base::Bind(&BindToBrowserConnector, base::Passed(&request))); |
| 47 return; | 47 return; |
| 48 } | 48 } |
| 49 | 49 |
| 50 content::ServiceManagerConnection::GetForProcess()->GetConnector() | 50 content::ServiceManagerConnection::GetForProcess()->GetConnector() |
| 51 ->BindRequest(std::move(request)); | 51 ->BindConnectorRequest(std::move(request)); |
| 52 } | 52 } |
| 53 | 53 |
| 54 void RunDecodeCallbackOnTaskRunner( | 54 void RunDecodeCallbackOnTaskRunner( |
| 55 const image_decoder::mojom::ImageDecoder::DecodeImageCallback& callback, | 55 const image_decoder::mojom::ImageDecoder::DecodeImageCallback& callback, |
| 56 scoped_refptr<base::SequencedTaskRunner> task_runner, | 56 scoped_refptr<base::SequencedTaskRunner> task_runner, |
| 57 const SkBitmap& image) { | 57 const SkBitmap& image) { |
| 58 task_runner->PostTask(FROM_HERE, base::Bind(callback, image)); | 58 task_runner->PostTask(FROM_HERE, base::Bind(callback, image)); |
| 59 } | 59 } |
| 60 | 60 |
| 61 void DecodeImage( | 61 void DecodeImage( |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 auto it = image_request_id_map_.find(request_id); | 212 auto it = image_request_id_map_.find(request_id); |
| 213 if (it == image_request_id_map_.end()) | 213 if (it == image_request_id_map_.end()) |
| 214 return; | 214 return; |
| 215 image_request = it->second; | 215 image_request = it->second; |
| 216 image_request_id_map_.erase(it); | 216 image_request_id_map_.erase(it); |
| 217 } | 217 } |
| 218 | 218 |
| 219 DCHECK(image_request->task_runner()->RunsTasksOnCurrentThread()); | 219 DCHECK(image_request->task_runner()->RunsTasksOnCurrentThread()); |
| 220 image_request->OnDecodeImageFailed(); | 220 image_request->OnDecodeImageFailed(); |
| 221 } | 221 } |
| OLD | NEW |