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

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

Issue 2008193002: Change mojo geometry structs from using type converters to StructTraits. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/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 dd59a10f8f7b2254f97b02da59e65e6f04d69c78..e0ff6858a82daeb8560e4a1486ab40ef2e681f50 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -115,7 +115,6 @@
#include "content/public/common/url_utils.h"
#include "content/public/common/web_preferences.h"
#include "mojo/common/url_type_converters.h"
-#include "mojo/converters/geometry/geometry_type_converters.h"
#include "net/base/url_util.h"
#include "net/http/http_cache.h"
#include "net/http/http_transaction_factory.h"
@@ -4842,12 +4841,11 @@ void WebContentsImpl::OnDidDownloadImage(
const GURL& image_url,
int32_t http_status_code,
mojo::Array<skia::mojom::BitmapPtr> images,
- mojo::Array<mojo::SizePtr> original_image_sizes) {
+ mojo::Array<gfx::Size> original_image_sizes) {
const std::vector<SkBitmap> bitmaps = images.To<std::vector<SkBitmap>>();
- const std::vector<gfx::Size> sizes =
- original_image_sizes.To<std::vector<gfx::Size>>();
- callback.Run(id, http_status_code, image_url, bitmaps, sizes);
+ callback.Run(id, http_status_code, image_url, bitmaps,
+ original_image_sizes.PassStorage());
}
void WebContentsImpl::OnDialogClosed(int render_process_id,

Powered by Google App Engine
This is Rietveld 408576698