[Refactor] Change FaviconService API to take in a desired pixel size

chrome/browser/android/favicon_helper.cc

 // Copyright 2013 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 "chrome/browser/android/favicon_helper.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 21 matching lines @@
 using base::android::ScopedJavaLocalRef;
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF8ToJavaString;
 
 namespace {
 
 void OnLocalFaviconAvailable(
     ScopedJavaGlobalRef<jobject>* j_favicon_image_callback,
-    const favicon_base::FaviconImageResult& favicon_image_result) {
+    const favicon_base::FaviconRawBitmapResult& result) {
   JNIEnv* env = AttachCurrentThread();
 
   // Convert favicon_image_result to java objects.
   ScopedJavaLocalRef<jstring> j_icon_url =
-      ConvertUTF8ToJavaString(env, favicon_image_result.icon_url.spec());
-  SkBitmap favicon_bitmap = favicon_image_result.image.AsBitmap();
+      ConvertUTF8ToJavaString(env, result.icon_url.spec());
   ScopedJavaLocalRef<jobject> j_favicon_bitmap;
-  if (!favicon_bitmap.isNull())
-    j_favicon_bitmap = gfx::ConvertToJavaBitmap(&favicon_bitmap);
+  if (result.is_valid()) {
+    SkBitmap favicon_bitmap;
+    gfx::PNGCodec::Decode(result.bitmap_data->front(),
+                          result.bitmap_data->size(),
+                          &favicon_bitmap);
+    if (!favicon_bitmap.isNull())
+      j_favicon_bitmap = gfx::ConvertToJavaBitmap(&favicon_bitmap);
+  }
 
   // Call java side OnLocalFaviconAvailable method.
   Java_FaviconImageCallback_onFaviconAvailable(env,
                                                j_favicon_image_callback->obj(),
                                                j_favicon_bitmap.obj(),
                                                j_icon_url.obj());
 }
 
 void OnFaviconRawBitmapResultAvailable(
     ScopedJavaGlobalRef<jobject>* j_favicon_image_callback,
@@ skipping 34 matching lines @@
 void FaviconHelper::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 jboolean FaviconHelper::GetLocalFaviconImageForURL(
     JNIEnv* env,
     jobject obj,
     jobject j_profile,
     jstring j_page_url,
     jint j_icon_types,
-    jint j_desired_size_in_dip,
+    jint j_desired_size_in_pixel,

[sky, 2014/07/10 00:03:39]

Were all call sites already passing in pixels?

[pkotwicz, 2014/07/11 01:23:08]

In the implementation of OnLocalFaviconAvailable() on the left,
gfx::Image::AsBitmap() is used to get to the SkBitmap to return. AsBitmap()
returns the 1x bitmap.

     jobject j_favicon_image_callback) {
   Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile);
   DCHECK(profile);
   if (!profile)
     return false;
 
   FaviconService* favicon_service = FaviconServiceFactory::GetForProfile(
       profile, Profile::EXPLICIT_ACCESS);
   DCHECK(favicon_service);
   if (!favicon_service)
     return false;
 
-  FaviconService::FaviconForPageURLParams params(
-      GURL(ConvertJavaStringToUTF16(env, j_page_url)),
-      static_cast<int>(j_icon_types),
-      static_cast<int>(j_desired_size_in_dip));
-
   ScopedJavaGlobalRef<jobject>* j_scoped_favicon_callback =
       new ScopedJavaGlobalRef<jobject>();
   j_scoped_favicon_callback->Reset(env, j_favicon_image_callback);
 
   favicon_base::FaviconImageCallback callback_runner = base::Bind(
       &OnLocalFaviconAvailable, base::Owned(j_scoped_favicon_callback));
 
-  favicon_service->GetFaviconImageForPageURL(
-      params, callback_runner,
+  favicon_service->GetRawFaviconForPageURL(
+      GURL(ConvertJavaStringToUTF16(env, j_page_url),
+      static_cast<int>(j_icon_types),
+      static_cast<int>(j_desired_size_in_pixel),
+      callback_runner,
       cancelable_task_tracker_.get());
 
   return true;
 }
 
 void FaviconHelper::GetLargestRawFaviconForUrl(
     JNIEnv* env,
     jobject obj,
     jobject j_profile,
     jstring j_page_url,
@@ skipping 72 matching lines @@
 
     gfx::JavaBitmap bitmap_lock(bitmap);
     SkBitmap skbitmap = gfx::CreateSkBitmapFromJavaBitmap(bitmap_lock);
     return color_utils::CalculateKMeanColorOfBitmap(skbitmap);
 }
 
 // static
 bool FaviconHelper::RegisterFaviconHelper(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }