[mojo] Get rid of Skia type converters

content/renderer/image_downloader/image_downloader_impl.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/image_downloader/image_downloader_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "content/child/image_decoder.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/renderer/fetchers/multi_resolution_image_resource_fetcher.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "net/base/data_url.h"
 #include "skia/ext/image_operations.h"
-#include "skia/public/type_converters.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "url/url_constants.h"
 
 using blink::WebFrame;
@@ skipping 125 matching lines @@
           gfx::Size(data_image.width(), data_image.height()));
     }
   } else {
     if (FetchImage(image_url, is_favicon, max_image_size, bypass_cache,
                    callback)) {
       // Will complete asynchronously via ImageDownloaderImpl::DidFetchImage
       return;
     }
   }
 
-  ReplyDownloadResult(0, result_images, result_original_image_sizes, callback);
+  ReplyDownloadResult(0, &result_images, result_original_image_sizes, callback);
 }
 
 bool ImageDownloaderImpl::FetchImage(const GURL& image_url,
                                      bool is_favicon,
                                      uint32_t max_image_size,
                                      bool bypass_cache,
                                      const DownloadImageCallback& callback) {
   blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
   DCHECK(frame);
 
@@ skipping 11 matching lines @@
 void ImageDownloaderImpl::DidFetchImage(
     uint32_t max_image_size,
     const DownloadImageCallback& callback,
     MultiResolutionImageResourceFetcher* fetcher,
     const std::vector<SkBitmap>& images) {
   std::vector<SkBitmap> result_images;
   std::vector<gfx::Size> result_original_image_sizes;
   FilterAndResizeImagesForMaximalSize(images, max_image_size, &result_images,
                                       &result_original_image_sizes);
 
-  ReplyDownloadResult(fetcher->http_status_code(), result_images,
+  ReplyDownloadResult(fetcher->http_status_code(), &result_images,
                       result_original_image_sizes, callback);
 
   // Remove the image fetcher from our pending list. We're in the callback from
   // MultiResolutionImageResourceFetcher, best to delay deletion.
   ImageResourceFetcherList::iterator iter =
       std::find(image_fetchers_.begin(), image_fetchers_.end(), fetcher);
   if (iter != image_fetchers_.end()) {
     image_fetchers_.weak_erase(iter);
     base::MessageLoop::current()->DeleteSoon(FROM_HERE, fetcher);
   }
 }
 
 void ImageDownloaderImpl::ReplyDownloadResult(
     int32_t http_status_code,
-    const std::vector<SkBitmap>& result_images,
+    std::vector<SkBitmap>* result_images,
     const std::vector<gfx::Size>& result_original_image_sizes,
     const DownloadImageCallback& callback) {
   image_downloader::DownloadResultPtr result =
       image_downloader::DownloadResult::New();
 
   result->http_status_code = http_status_code;
-  result->images = mojo::Array<skia::BitmapPtr>::From(result_images);
+  result->images.Swap(result_images);
   result->original_image_sizes =
       mojo::Array<mojo::SizePtr>::From(result_original_image_sizes);
 
   callback.Run(std::move(result));
 }
 
 }  // namespace content