content/browser/web_contents/web_contents_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/browser/web_contents/web_contents_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/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index e67fc30d38417aa139d25eeab2d84c7e4051ff2e..7268a272ef5e001f22062b92ab976a0a02c94908 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -120,7 +120,6 @@

#include "net/http/http_transaction_factory.h"

#include "net/url_request/url_request_context.h"

#include "net/url_request/url_request_context_getter.h"

-#include "skia/public/type_converters.h"

#include "third_party/WebKit/public/web/WebSandboxFlags.h"

#include "third_party/skia/include/core/SkBitmap.h"

#include "ui/accessibility/ax_tree_combiner.h"

@@ -4846,7 +4845,7 @@ void WebContentsImpl::OnDidDownloadImage(

int id,

const GURL& image_url,

int32_t http_status_code,

- mojo::Array<skia::mojom::BitmapPtr> images,

+ mojo::Array<SkBitmap> images,

mojo::Array<gfx::Size> original_image_sizes) {

const std::vector<SkBitmap> bitmaps = images.To<std::vector<SkBitmap>>();