Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / favicon_source.cc

diff --git a/src/chrome/browser/ui/webui/favicon_source.cc b/src/chrome/browser/ui/webui/favicon_source.cc
index 2b322eb..fa06874 100644 (file)
--- a/src/chrome/browser/ui/webui/favicon_source.cc
+++ b/src/chrome/browser/ui/webui/favicon_source.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/ui/webui/favicon_source.h"
 
+#include <cmath>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/strings/string_number_conversions.h"
@@ -77,15 +79,16 @@ void FaviconSource::StartDataRequest(
   }
 
   GURL url(parsed.url);
+  int desired_size_in_pixel =
+      std::ceil(parsed.size_in_dip * parsed.device_scale_factor);
 
   if (parsed.is_icon_url) {
     // TODO(michaelbai): Change GetRawFavicon to support combination of
     // IconType.
-    favicon_service->GetRawFavicon(
+   favicon_service->GetRawFavicon(
         url,
         favicon_base::FAVICON,
-        parsed.size_in_dip,
-        parsed.device_scale_factor,
+        desired_size_in_pixel,
         base::Bind(
             &FaviconSource::OnFaviconDataAvailable,
             base::Unretained(this),
@@ -108,9 +111,9 @@ void FaviconSource::StartDataRequest(
     }
 
     favicon_service->GetRawFaviconForPageURL(
-        FaviconService::FaviconForPageURLParams(
-            url, icon_types_, parsed.size_in_dip),
-        parsed.device_scale_factor,
+        url,
+        icon_types_,
+        desired_size_in_pixel,
         base::Bind(
             &FaviconSource::OnFaviconDataAvailable,
             base::Unretained(this),