diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-03 01:11:58 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-03 01:11:58 +0000 |
| commit | ae615162135445eb0b94365b1a1cfa511e7f4be4 (patch) | |
| tree | a32c9ad049aa25b3c40038713d546c3521d3d20e /chrome/browser/fav_icon_helper.cc | |
| parent | 693f8e4af78b0bb38cb56cd913c8774c75b43067 (diff) | |
| download | chromium_src-ae615162135445eb0b94365b1a1cfa511e7f4be4.zip chromium_src-ae615162135445eb0b94365b1a1cfa511e7f4be4.tar.gz chromium_src-ae615162135445eb0b94365b1a1cfa511e7f4be4.tar.bz2 | |
Revert my skia file moves because of layout test failures.
Review URL: http://codereview.chromium.org/12892
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/fav_icon_helper.cc')
| -rw-r--r-- | chrome/browser/fav_icon_helper.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc index 2f05357..f77b05c 100644 --- a/chrome/browser/fav_icon_helper.cc +++ b/chrome/browser/fav_icon_helper.cc @@ -4,6 +4,7 @@ #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" @@ -12,7 +13,6 @@ #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 skia::ImageOperations::Resize( - image, skia::ImageOperations::RESIZE_LANCZOS3, + return gfx::ImageOperations::Resize( + image, gfx::ImageOperations::RESIZE_LANCZOS3, gfx::Size(width, height)); } return image; |