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

Unified Diff: content/browser/web_contents/web_contents_impl.cc

Issue 1648533002: [mojo] Get rid of Skia type converters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@native-arrays
Patch Set: fix ios gyp; proper pickle sizing Created 4 years, 11 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 | « no previous file | content/common/BUILD.gn » ('j') | mojo/public/tools/bindings/mojom.gni » ('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 4ff0a3a18951b3884bacf6315ffc450b21b2da24..1d3fc9b1103473d8464d4e0ea59a8c1ae1a938bd 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -113,7 +113,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/base/layout.h"
@@ -158,8 +157,8 @@ static void DidDownloadImage(const WebContents::ImageDownloadCallback& callback,
image_downloader::DownloadResultPtr result) {
DCHECK(result);
- const std::vector<SkBitmap> images =
- result->images.To<std::vector<SkBitmap>>();
+ std::vector<SkBitmap> images;
+ result->images.Swap(&images);
const std::vector<gfx::Size> original_image_sizes =
result->original_image_sizes.To<std::vector<gfx::Size>>();
« no previous file with comments | « no previous file | content/common/BUILD.gn » ('j') | mojo/public/tools/bindings/mojom.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698