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

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])));
   }