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

Unified Diff: content/renderer/image_downloader/image_downloader_impl.cc

Issue 2014013002: Add SkBitmap StructTraits for skia::mojo::Bitmap. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix return build errors. Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/image_downloader/image_downloader_impl.cc
diff --git a/content/renderer/image_downloader/image_downloader_impl.cc b/content/renderer/image_downloader/image_downloader_impl.cc
index 774b23477ec8263b22dc939eed455908d1d12e0d..cf30283b7e18dcaf692637b949c31343eabbfbd5 100644
--- a/content/renderer/image_downloader/image_downloader_impl.cc
+++ b/content/renderer/image_downloader/image_downloader_impl.cc
@@ -16,7 +16,6 @@
#include "mojo/common/url_type_converters.h"
#include "net/base/data_url.h"
#include "skia/ext/image_operations.h"
-#include "skia/public/type_converters.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
#include "third_party/WebKit/public/platform/WebVector.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ -220,8 +219,7 @@ void ImageDownloaderImpl::ReplyDownloadResult(
const std::vector<SkBitmap>& result_images,
const std::vector<gfx::Size>& result_original_image_sizes,
const DownloadImageCallback& callback) {
- callback.Run(http_status_code,
- mojo::Array<skia::mojom::BitmapPtr>::From(result_images),
+ callback.Run(http_status_code, mojo::Array<SkBitmap>::From(result_images),
mojo::Array<mojo::SizePtr>::From(result_original_image_sizes));
}

Powered by Google App Engine
This is Rietveld 408576698