Rename FaviconBitmapXxx to FaviconRawBitmapXxx

chrome/browser/favicon/favicon_util.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/favicon/favicon_util.h"
 
 #include "components/favicon_base/favicon_types.h"
 #include "components/favicon_base/select_favicon_frames.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/gfx/image/image_png_rep.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/size.h"
 
 #if defined(OS_MACOSX) && !defined(OS_IOS)
 #include "base/mac/mac_util.h"
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 
 namespace {
 
 // Creates image reps of DIP size |favicon_size| for the subset of
 // |scale_factors| for which the image reps can be created without resizing
 // or decoding the bitmap data.
 std::vector<gfx::ImagePNGRep> SelectFaviconFramesFromPNGsWithoutResizing(
-    const std::vector<favicon_base::FaviconBitmapResult>& png_data,
+    const std::vector<favicon_base::FaviconRawBitmapResult>& png_data,
     const std::vector<ui::ScaleFactor>& scale_factors,
     int favicon_size) {
   std::vector<gfx::ImagePNGRep> png_reps;
   if (png_data.empty())
     return png_reps;
 
   // A |favicon_size| of 0 indicates that the largest frame is desired.
   if (favicon_size == 0) {
     int maximum_area = 0;
     scoped_refptr<base::RefCountedMemory> best_candidate;
@@ skipping 127 matching lines @@
 
 // static
 void FaviconUtil::SetFaviconColorSpace(gfx::Image* image) {
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   image->SetSourceColorSpace(base::mac::GetSystemColorSpace());
 #endif  // defined(OS_MACOSX) && !defined(OS_IOS)
 }
 
 // static
 gfx::Image FaviconUtil::SelectFaviconFramesFromPNGs(
-    const std::vector<favicon_base::FaviconBitmapResult>& png_data,
+    const std::vector<favicon_base::FaviconRawBitmapResult>& png_data,
     const std::vector<ui::ScaleFactor>& scale_factors,
     int favicon_size) {
   // Create image reps for as many scale factors as possible without resizing
   // the bitmap data or decoding it. FaviconHandler stores already resized
   // favicons into history so no additional resizing should be needed in the
   // common case.
   // Creating the gfx::Image from |png_data| without resizing or decoding if
   // possible is important because:
   // - Sync does a byte-to-byte comparison of gfx::Image::As1xPNGBytes() to
   //   the data it put into the database in order to determine whether any
@@ skipping 58 matching lines @@
     scoped_refptr<base::RefCountedBytes> png_bytes(new base::RefCountedBytes());
     if (gfx::PNGCodec::EncodeBGRASkBitmap(
         resized_image_skia_reps[i].sk_bitmap(), false, &png_bytes->data())) {
       png_reps.push_back(gfx::ImagePNGRep(png_bytes,
           resized_image_skia_reps[i].scale()));
     }
   }
 
   return gfx::Image(png_reps);
 }