summaryrefslogtreecommitdiffstats
path: root/chrome/browser/fav_icon_helper.cc
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 22:35:42 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 22:35:42 +0000
commit004a96a015b5dfcadaad4ea1b192c97c415b75de (patch)
treecb32d3809e4366c07e837416a106a3083d2690a5 /chrome/browser/fav_icon_helper.cc
parentf8ed412acb7bcab9855d0ebd9d29f7e38a3a8f92 (diff)
downloadchromium_src-004a96a015b5dfcadaad4ea1b192c97c415b75de.zip
chromium_src-004a96a015b5dfcadaad4ea1b192c97c415b75de.tar.gz
chromium_src-004a96a015b5dfcadaad4ea1b192c97c415b75de.tar.bz2
Move convolver, image_operations, and skia_utils from base/gfx to skia/ext.
This changes the namespace in those files from "gfx" to "skia". I split skia_utils into two parts, the Windows specific part is now in a separate file called skia_utils_win. There were several obsolete includes of these headers which I removed. I also removed img_resize_perftest which isn't used and has bitrotted. Review URL: http://codereview.chromium.org/12842 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/fav_icon_helper.cc')
-rw-r--r--chrome/browser/fav_icon_helper.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc
index f77b05c..2f05357 100644
--- a/chrome/browser/fav_icon_helper.cc
+++ b/chrome/browser/fav_icon_helper.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/fav_icon_helper.h"
-#include "base/gfx/image_operations.h"
#include "base/gfx/png_decoder.h"
#include "base/gfx/png_encoder.h"
#include "chrome/browser/navigation_entry.h"
@@ -13,6 +12,7 @@
#include "chrome/browser/render_view_host.h"
#include "chrome/browser/web_contents.h"
#include "chrome/common/gfx/favicon_size.h"
+#include "skia/ext/image_operations.h"
FavIconHelper::FavIconHelper(WebContents* web_contents)
: web_contents_(web_contents),
@@ -257,8 +257,8 @@ SkBitmap FavIconHelper::ConvertToFavIconSize(const SkBitmap& image) {
int height = image.height();
if (width > 0 && height > 0) {
calc_favicon_target_size(&width, &height);
- return gfx::ImageOperations::Resize(
- image, gfx::ImageOperations::RESIZE_LANCZOS3,
+ return skia::ImageOperations::Resize(
+ image, skia::ImageOperations::RESIZE_LANCZOS3,
gfx::Size(width, height));
}
return image;