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

Issues Search
    My Issues | Starred     Open | Closed | All

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: 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
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/content_common_mojo_bindings.gyp » ('j') | skia/public/interfaces/bitmap_skbitmap_struct_traits.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 678611e573f7695c029785af02986e4094e34319..103422fdf2dffb449941f5f143106b5733282b8d 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"
@@ -4847,7 +4846,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<mojo::SizePtr> original_image_sizes) {
const std::vector<SkBitmap> bitmaps = images.To<std::vector<SkBitmap>>();
const std::vector<gfx::Size> sizes =
« no previous file with comments | « content/browser/web_contents/web_contents_impl.h ('k') | content/content_common_mojo_bindings.gyp » ('j') | skia/public/interfaces/bitmap_skbitmap_struct_traits.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698