[Suggestions] Introduce a different image encoder/decoder for iOS

components/suggestions/image_manager.cc

 // Copyright 2014 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 "components/suggestions/image_manager.h"
 
 #include "base/bind.h"
 #include "components/suggestions/image_fetcher.h"
+
+#if defined(OS_IOS)
+#include "components/suggestions/image_manager_utils_ios.h"
+#else
 #include "ui/gfx/codec/jpeg_codec.h"
+#endif
 
 using leveldb_proto::ProtoDatabase;
 
 namespace {
 
-// From JPEG-encoded bytes to SkBitmap.
+// From encoded bytes to SkBitmap.
 SkBitmap* DecodeImage(const std::vector<unsigned char>& encoded_data) {
+#if defined(OS_IOS)
+  return suggestions::DecodeJPEGToSkBitmap(encoded_data);

[blundell, 2014/10/10 06:01:05]

nit: this should be in the suggestions namespace, and then this can go.

[Mathieu, 2014/10/10 18:06:10]

Done.

+#else
   return gfx::JPEGCodec::Decode(&encoded_data[0], encoded_data.size());
+#endif
 }
 
 }  // namespace
 
 namespace suggestions {
 
 ImageManager::ImageManager() : weak_ptr_factory_(this) {}
 
 ImageManager::ImageManager(scoped_ptr<ImageFetcher> image_fetcher,
                            scoped_ptr<ProtoDatabase<ImageData> > database,
@@ skipping 180 matching lines @@
     for (CallbackVector::const_iterator callback_it = request.callbacks.begin();
          callback_it != request.callbacks.end(); ++callback_it) {
       ServeFromCacheOrNetwork(request.url, request.image_url, *callback_it);
     }
   }
 }
 
 // static
 bool ImageManager::EncodeImage(const SkBitmap& bitmap,
                                std::vector<unsigned char>* dest) {
+#if defined(OS_IOS)
+  return suggestions::EncodeSkBitmapToJPEG(bitmap, dest);

[blundell, 2014/10/10 06:01:05]

this is in the suggestions namespace.

[Mathieu, 2014/10/10 18:06:10]

Done.

+#else
   SkAutoLockPixels bitmap_lock(bitmap);
   if (!bitmap.readyToDraw() || bitmap.isNull()) {
     return false;
   }
   return gfx::JPEGCodec::Encode(
       reinterpret_cast<unsigned char*>(bitmap.getAddr32(0, 0)),
       gfx::JPEGCodec::FORMAT_SkBitmap, bitmap.width(), bitmap.height(),
       bitmap.rowBytes(), 100, dest);
+#endif
 }
 
 }  // namespace suggestions