Index: chrome/browser/image_decoder.cc |
diff --git a/chrome/browser/image_decoder.cc b/chrome/browser/image_decoder.cc |
index 6823dbcfd67f27f5a93af5d87b02e4656898b3d0..ee9dd6cf6ce336d565a880b53e4fd0697e669dc9 100644 |
--- a/chrome/browser/image_decoder.cc |
+++ b/chrome/browser/image_decoder.cc |
@@ -13,7 +13,7 @@ |
#include "content/public/browser/browser_thread.h" |
#include "content/public/common/service_manager_connection.h" |
#include "ipc/ipc_channel.h" |
-#include "services/image_decoder/public/cpp/decode.h" |
+#include "services/data_decoder/public/cpp/decode_image.h" |
#include "services/service_manager/public/cpp/connector.h" |
#include "third_party/skia/include/core/SkBitmap.h" |
#include "ui/gfx/geometry/size.h" |
@@ -24,7 +24,7 @@ const int64_t kMaxImageSizeInBytes = |
static_cast<int64_t>(IPC::Channel::kMaximumMessageSize); |
// Note that this is always called on the thread which initiated the |
-// corresponding image_decoder::Decode request. |
+// corresponding data_decoder::DecodeImage request. |
void OnDecodeImageDone( |
base::Callback<void(int)> fail_callback, |
base::Callback<void(const SkBitmap&, int)> success_callback, |
@@ -49,7 +49,7 @@ void BindToBrowserConnector(service_manager::mojom::ConnectorRequest request) { |
} |
void RunDecodeCallbackOnTaskRunner( |
- const image_decoder::mojom::ImageDecoder::DecodeImageCallback& callback, |
+ const data_decoder::mojom::ImageDecoder::DecodeImageCallback& callback, |
scoped_refptr<base::SequencedTaskRunner> task_runner, |
const SkBitmap& image) { |
task_runner->PostTask(FROM_HERE, base::Bind(callback, image)); |
@@ -57,10 +57,10 @@ void RunDecodeCallbackOnTaskRunner( |
void DecodeImage( |
std::vector<uint8_t> image_data, |
- image_decoder::mojom::ImageCodec codec, |
+ data_decoder::mojom::ImageCodec codec, |
bool shrink_to_fit, |
const gfx::Size& desired_image_frame_size, |
- const image_decoder::mojom::ImageDecoder::DecodeImageCallback& callback, |
+ const data_decoder::mojom::ImageDecoder::DecodeImageCallback& callback, |
scoped_refptr<base::SequencedTaskRunner> callback_task_runner) { |
DCHECK_CURRENTLY_ON(content::BrowserThread::IO); |
@@ -69,10 +69,10 @@ void DecodeImage( |
service_manager::Connector::Create(&connector_request); |
BindToBrowserConnector(std::move(connector_request)); |
- image_decoder::Decode(connector.get(), image_data, codec, shrink_to_fit, |
- kMaxImageSizeInBytes, desired_image_frame_size, |
- base::Bind(&RunDecodeCallbackOnTaskRunner, callback, |
- callback_task_runner)); |
+ data_decoder::DecodeImage(connector.get(), image_data, codec, shrink_to_fit, |
+ kMaxImageSizeInBytes, desired_image_frame_size, |
+ base::Bind(&RunDecodeCallbackOnTaskRunner, callback, |
+ callback_task_runner)); |
} |
} // namespace |
@@ -152,13 +152,13 @@ void ImageDecoder::StartWithOptionsImpl( |
image_request_id_map_.insert(std::make_pair(request_id, image_request)); |
} |
- image_decoder::mojom::ImageCodec codec = |
- image_decoder::mojom::ImageCodec::DEFAULT; |
+ data_decoder::mojom::ImageCodec codec = |
+ data_decoder::mojom::ImageCodec::DEFAULT; |
#if defined(OS_CHROMEOS) |
if (image_codec == ROBUST_JPEG_CODEC) |
- codec = image_decoder::mojom::ImageCodec::ROBUST_JPEG; |
+ codec = data_decoder::mojom::ImageCodec::ROBUST_JPEG; |
if (image_codec == ROBUST_PNG_CODEC) |
- codec = image_decoder::mojom::ImageCodec::ROBUST_PNG; |
+ codec = data_decoder::mojom::ImageCodec::ROBUST_PNG; |
#endif // defined(OS_CHROMEOS) |
auto callback = base::Bind( |