content/renderer/image_downloader/image_downloader_impl.cc - Issue 2014013002: Add SkBitmap StructTraits for skia::mojo::Bitmap.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Sync and rebase. 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:

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 9a8b09df412807ad5e5fddda42c888f79728de02..b08decf0cc53ef4ec6848a8daed1d93d551e084e 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"

@@ -219,8 +218,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),

result_original_image_sizes);

}

« no previous file with comments | « content/renderer/BUILD.gn ('k') | mash/shelf/public/interfaces/BUILD.gn » ('j') | no next file with comments »