Convert ui::ScaleFactor -> float in favicon/history code

chrome/browser/ui/webui/favicon_source.cc

 // Copyright (c) 2012 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/ui/webui/favicon_source.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/instant_io_context.h"
 #include "chrome/browser/sync/open_tabs_ui_delegate.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/common/favicon/favicon_url_parser.h"
 #include "chrome/common/url_constants.h"
 #include "grit/locale_settings.h"
 #include "grit/ui_resources.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/web_ui_util.h"
 
 FaviconSource::IconRequest::IconRequest()
-    : size_in_dip(gfx::kFaviconSize),
-      scale_factor(ui::SCALE_FACTOR_NONE) {
+    : size_in_dip(gfx::kFaviconSize), device_scale_factor(1.0f) {
 }
 
 FaviconSource::IconRequest::IconRequest(
     const content::URLDataSource::GotDataCallback& cb,
     const GURL& path,
     int size,
-    ui::ScaleFactor scale)
+    float scale)
     : callback(cb),
       request_path(path),
       size_in_dip(size),
-      scale_factor(scale) {
+      device_scale_factor(scale) {
 }
 
 FaviconSource::IconRequest::~IconRequest() {
 }
 
 FaviconSource::FaviconSource(Profile* profile, IconType type)
     : profile_(profile->GetOriginalProfile()),
       icon_types_(type == FAVICON ? favicon_base::FAVICON
                                   : favicon_base::TOUCH_PRECOMPOSED_ICON |
                                         favicon_base::TOUCH_ICON |
@@ skipping 21 matching lines @@
 
   chrome::ParsedFaviconPath parsed;
   bool success = chrome::ParseFaviconPath(path, icon_types_, &parsed);
   if (!success) {
     SendDefaultResponse(callback);
     return;
   }
 
   GURL url(parsed.url);
 
-  ui::ScaleFactor scale_factor =
-      ui::GetSupportedScaleFactor(parsed.scale_factor);
   if (parsed.is_icon_url) {
     // TODO(michaelbai): Change GetRawFavicon to support combination of
     // IconType.
     favicon_service->GetRawFavicon(
         url,
         favicon_base::FAVICON,
         parsed.size_in_dip,
-        scale_factor,
-        base::Bind(&FaviconSource::OnFaviconDataAvailable,
-                   base::Unretained(this),
-                   IconRequest(
-                       callback, url, parsed.size_in_dip, scale_factor)),
+        parsed.device_scale_factor,
+        base::Bind(
+            &FaviconSource::OnFaviconDataAvailable,
+            base::Unretained(this),
+            IconRequest(
+                callback, url, parsed.size_in_dip, parsed.device_scale_factor)),
         &cancelable_task_tracker_);
   } else {
     // Intercept requests for prepopulated pages.
     for (size_t i = 0; i < arraysize(history::kPrepopulatedPages); i++) {
       if (url.spec() ==
           l10n_util::GetStringUTF8(history::kPrepopulatedPages[i].url_id)) {
+        ui::ScaleFactor resource_scale_factor =
+            ui::GetSupportedScaleFactor(parsed.device_scale_factor);
         callback.Run(
             ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
                 history::kPrepopulatedPages[i].favicon_id,
-                scale_factor));
+                resource_scale_factor));
         return;
       }
     }
 
     favicon_service->GetRawFaviconForPageURL(
         FaviconService::FaviconForPageURLParams(
             url, icon_types_, parsed.size_in_dip),
-        scale_factor,
+        parsed.device_scale_factor,
         base::Bind(
             &FaviconSource::OnFaviconDataAvailable,
             base::Unretained(this),
-            IconRequest(callback, url, parsed.size_in_dip, scale_factor)),
+            IconRequest(
+                callback, url, parsed.size_in_dip, parsed.device_scale_factor)),
         &cancelable_task_tracker_);
   }
 }
 
 std::string FaviconSource::GetMimeType(const std::string&) const {
   // We need to explicitly return a mime type, otherwise if the user tries to
   // drag the image they get no extension.
   return "image/png";
 }
 
@@ skipping 33 matching lines @@
     // Forward the data along to the networking system.
     request.callback.Run(bitmap_result.bitmap_data.get());
   } else if (!HandleMissingResource(request)) {
     SendDefaultResponse(request);
   }
 }
 
 void FaviconSource::SendDefaultResponse(
     const content::URLDataSource::GotDataCallback& callback) {
   SendDefaultResponse(
       IconRequest(callback, GURL(), 16, ui::SCALE_FACTOR_100P));

[pkotwicz, 2014/06/20 00:35:41]

Noooooooooooooooooo

ui::SCALE_FACTOR_100P -> 1.0f
In the past, I have caught mistakes where we passed in an enum value to code
which expects a float by temporarily making ui::ScaleFactor a class.

[oshima, 2014/06/20 04:16:34]

yeah, that's why I didn't want to use float, and also wanted to make this  a
class but anyway fixed.

 }
 
 void FaviconSource::SendDefaultResponse(const IconRequest& icon_request) {
   int favicon_index;
   int resource_id;
   switch (icon_request.size_in_dip) {
     case 64:
       favicon_index = SIZE_64;
       resource_id = IDR_DEFAULT_FAVICON_64;
       break;
     case 32:
       favicon_index = SIZE_32;
       resource_id = IDR_DEFAULT_FAVICON_32;
       break;
     default:
       favicon_index = SIZE_16;
       resource_id = IDR_DEFAULT_FAVICON;
       break;
   }
   base::RefCountedMemory* default_favicon =
       default_favicons_[favicon_index].get();
 
   if (!default_favicon) {
-    default_favicon = ResourceBundle::GetSharedInstance()
-        .LoadDataResourceBytesForScale(resource_id,
-                                       icon_request.scale_factor);
+    ui::ScaleFactor resource_scale_factor =
+        ui::GetSupportedScaleFactor(icon_request.device_scale_factor);
+    default_favicon =
+        ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
+            resource_id, resource_scale_factor);
     default_favicons_[favicon_index] = default_favicon;
   }
 
   icon_request.callback.Run(default_favicon);
 }