Move Image operations and convolver to the skia namespace and clean up a few ...

chrome/common/gfx/icon_util.cc

 // Copyright (c) 2006-2008 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/common/gfx/icon_util.h"
 #include "base/file_util.h"
 #include "base/gfx/size.h"
 #include "base/logging.h"
 #include "chrome/common/win_util.h"
 #include "skia/ext/image_operations.h"
@@ skipping 385 matching lines @@
         inserted_original_bitmap = true;
         continue;
       }
 
       if ((bitmap_to_resize.width() < icon_dimensions_[i]) &&
           (bitmap_to_resize.height() < icon_dimensions_[i])) {
         bitmaps->push_back(bitmap_to_resize);
         inserted_original_bitmap = true;
       }
     }
-    bitmaps->push_back(gfx::ImageOperations::Resize(
-        bitmap_to_resize, gfx::ImageOperations::RESIZE_LANCZOS3,
-        gfx::Size(icon_dimensions_[i], icon_dimensions_[i])));
+    bitmaps->push_back(skia::ImageOperations::Resize(
+        bitmap_to_resize, skia::ImageOperations::RESIZE_LANCZOS3,
+        icon_dimensions_[i], icon_dimensions_[i]));
   }
 
   if (!inserted_original_bitmap) {
     bitmaps->push_back(bitmap_to_resize);
   }
 }
 
 int IconUtil::ComputeIconFileBufferSize(const std::vector<SkBitmap>& set) {
   // We start by counting the bytes for the structures that don't depend on the
   // number of icon images. Note that sizeof(ICONDIR) already accounts for a
@@ skipping 49 matching lines @@
   // number by the image height in order to get the total number of bytes for
   // the AND mask. Thus, for a 15X15 image, we need 15 * 4 which is 60 bytes
   // for the monochrome bitmap representing the AND mask.
   int and_line_length = (bitmap.width() + 7) >> 3;
   and_line_length = (and_line_length + 3) & ~3;
   *and_mask_size = and_line_length * bitmap.height();
   int masks_size = *xor_mask_size + *and_mask_size;
   *bytes_in_resource = masks_size + sizeof(BITMAPINFOHEADER);
 }