Remove implicit flooring Scale() method from Point and Size.

chrome/browser/extensions/extension_icon_image.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/extensions/extension_icon_image.h"
 
 #include <vector>
 
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/notification_service.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/canvas_image_source.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/size.h"
+#include "ui/gfx/size_conversions.h"
 
 // The ImageSkia provided by extensions::IconImage contains ImageSkiaReps that
 // are computed and updated using the following algorithm (if no default icon
 // was supplied, transparent icon is considered the default):
 // - |LoadImageForScaleFactors()| searches the extension for an icon of an
 //   appropriate size. If the extension doesn't have a icon resource needed for
 //   the image representation, the default icon's representation for the
 //   requested scale factor is returned by ImageSkiaSource.
 // - If the extension has the resource, IconImage tries to load it using
 //   ImageLoadingTracker.
@@ skipping 158 matching lines @@
     return default_icon_.GetRepresentation(scale_factor);
 
   int id = tracker_.next_id();
   load_map_[id].scale_factor = scale_factor;
   load_map_[id].is_async = false;
 
   std::vector<ImageLoadingTracker::ImageRepresentation> info_list;
   info_list.push_back(ImageLoadingTracker::ImageRepresentation(
       resource,
       ImageLoadingTracker::ImageRepresentation::ALWAYS_RESIZE,
-      gfx::Size(resource_size_in_dip_, resource_size_in_dip_).Scale(scale),
+      gfx::ToFlooredSize(
+          gfx::Size(resource_size_in_dip_, resource_size_in_dip_).Scale(scale)),
       scale_factor));
   tracker_.LoadImages(extension_, info_list, ImageLoadingTracker::DONT_CACHE);
 
   // If we have not received |OnImageLoaded|, image load request is
   // asynchronous.
   if (load_map_.find(id) != load_map_.end())
     load_map_[id].is_async = true;
 
   // If LoadImages returned synchronously and the requested image rep is cached
   // in the extension, return the cached image rep.
@@ skipping 42 matching lines @@
   DCHECK_EQ(type, chrome::NOTIFICATION_EXTENSION_UNLOADED);
 
   const Extension* extension =
       content::Details<extensions::UnloadedExtensionInfo>(details)->extension;
 
   if (extension_ == extension)
     extension_ = NULL;
 }
 
 }  // namespace extensions