Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / components / favicon_base / select_favicon_frames.cc

diff --git a/src/components/favicon_base/select_favicon_frames.cc b/src/components/favicon_base/select_favicon_frames.cc
index 671d732..492d211 100644 (file)
--- a/src/components/favicon_base/select_favicon_frames.cc
+++ b/src/components/favicon_base/select_favicon_frames.cc
@@ -41,8 +41,9 @@ SkBitmap SampleNearestNeighbor(const SkBitmap& contents, int desired_size) {
 
   {
     SkCanvas canvas(bitmap);
-    SkRect dest(SkRect::MakeWH(desired_size, desired_size));
-    canvas.drawBitmapRect(contents, NULL, dest);
+    canvas.drawBitmapRect(
+        contents, NULL,
+        SkRect::MakeFromIRect(SkIRect::MakeWH(desired_size, desired_size)));
   }
 
   return bitmap;
@@ -170,10 +171,10 @@ SkBitmap GetResizedBitmap(const SkBitmap& source_bitmap,
 class FaviconImageSource : public gfx::ImageSkiaSource {
  public:
   FaviconImageSource() {}
-  virtual ~FaviconImageSource() {}
+  ~FaviconImageSource() override {}
 
   // gfx::ImageSkiaSource:
-  virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+  gfx::ImageSkiaRep GetImageForScale(float scale) override {
     const gfx::ImageSkiaRep* rep = NULL;
     // gfx::ImageSkia passes one of the resource scale factors. The source
     // should return:
@@ -224,7 +225,8 @@ gfx::ImageSkia CreateFaviconImageSkia(
   } else {
     for (std::vector<float>::const_iterator iter = favicon_scales.begin();
          iter != favicon_scales.end(); ++iter) {
-      desired_sizes.push_back(ceil(desired_size_in_dip * (*iter)));
+      desired_sizes.push_back(
+          static_cast<int>(ceil(desired_size_in_dip * (*iter))));
     }
   }