diff options
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, 9 insertions, 5 deletions
diff --git a/chrome/common/gfx/color_utils.cc b/chrome/common/gfx/color_utils.cc index 0b40436..cdb4c0c 100644 --- a/chrome/common/gfx/color_utils.cc +++ b/chrome/common/gfx/color_utils.cc @@ -12,10 +12,13 @@ #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: @@ -252,7 +255,7 @@ SkColor SetColorAlpha(SkColor c, SkAlpha alpha) { SkColor GetSysSkColor(int which) { #if defined(OS_WIN) - return gfx::COLORREFToSkColor(::GetSysColor(which)); + return skia::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 e717c79..ae5e174 100644 --- a/chrome/common/gfx/icon_util.cc +++ b/chrome/common/gfx/icon_util.cc @@ -3,11 +3,12 @@ // 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 @@ -403,8 +404,8 @@ void IconUtil::CreateResizedBitmapSet(const SkBitmap& bitmap_to_resize, inserted_original_bitmap = true; } } - bitmaps->push_back(gfx::ImageOperations::Resize( - bitmap_to_resize, gfx::ImageOperations::RESIZE_LANCZOS3, + bitmaps->push_back(skia::ImageOperations::Resize( + bitmap_to_resize, skia::ImageOperations::RESIZE_LANCZOS3, gfx::Size(icon_dimensions_[i], icon_dimensions_[i]))); } |