| 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>>();
|
|
|
|
|