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/common/gfx | |
| 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/common/gfx')
| -rw-r--r-- | chrome/common/gfx/color_utils.cc | 7 | ||||
| -rw-r--r-- | chrome/common/gfx/icon_util.cc | 7 |
2 files changed, 5 insertions, 9 deletions
diff --git a/chrome/common/gfx/color_utils.cc b/chrome/common/gfx/color_utils.cc index cdb4c0c..0b40436 100644 --- a/chrome/common/gfx/color_utils.cc +++ b/chrome/common/gfx/color_utils.cc @@ -12,13 +12,10 @@ #include "chrome/common/gfx/color_utils.h" #include "base/basictypes.h" +#include "base/gfx/skia_utils.h" #include "base/logging.h" #include "skia/include/SkBitmap.h" -#if defined(OS_WIN) -#include "skia/ext/skia_utils_win.h" -#endif - namespace color_utils { // These transformations are based on the equations in: @@ -255,7 +252,7 @@ SkColor SetColorAlpha(SkColor c, SkAlpha alpha) { SkColor GetSysSkColor(int which) { #if defined(OS_WIN) - return skia::COLORREFToSkColor(::GetSysColor(which)); + return gfx::COLORREFToSkColor(::GetSysColor(which)); #else NOTIMPLEMENTED(); return SK_ColorLTGRAY; diff --git a/chrome/common/gfx/icon_util.cc b/chrome/common/gfx/icon_util.cc index ae5e174..e717c79 100644 --- a/chrome/common/gfx/icon_util.cc +++ b/chrome/common/gfx/icon_util.cc @@ -3,12 +3,11 @@ // found in the LICENSE file. #include "chrome/common/gfx/icon_util.h" - #include "base/file_util.h" +#include "base/gfx/image_operations.h" #include "base/gfx/size.h" #include "base/logging.h" #include "chrome/common/win_util.h" -#include "skia/ext/image_operations.h" #include "skia/include/SkBitmap.h" // Defining the dimensions for the icon images. We store only one value because @@ -404,8 +403,8 @@ void IconUtil::CreateResizedBitmapSet(const SkBitmap& bitmap_to_resize, inserted_original_bitmap = true; } } - bitmaps->push_back(skia::ImageOperations::Resize( - bitmap_to_resize, skia::ImageOperations::RESIZE_LANCZOS3, + bitmaps->push_back(gfx::ImageOperations::Resize( + bitmap_to_resize, gfx::ImageOperations::RESIZE_LANCZOS3, gfx::Size(icon_dimensions_[i], icon_dimensions_[i]))); } |