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

7 files changed, 12 insertions, 15 deletions

diff --git a/chrome/views/background.cc b/chrome/views/background.cc
index 72352b7..1aa631e 100644
--- a/chrome/views/background.cc
+++ b/chrome/views/background.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/views/background.h"
 
-#include "base/gfx/skia_utils.h"
 #include "base/logging.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/painter.h"
 #include "chrome/views/view.h"
+#include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkPaint.h"
 
 namespace views {
@@ -68,7 +68,7 @@ Background::~Background() {
 
 void Background::SetNativeControlColor(SkColor color) {
   DeleteObject(native_control_brush_);
-  native_control_brush_ = CreateSolidBrush(gfx::SkColorToCOLORREF(color));
+  native_control_brush_ = CreateSolidBrush(skia::SkColorToCOLORREF(color));
 }
 
 //static
diff --git a/chrome/views/button.cc b/chrome/views/button.cc
index 93e2e3c..36c228a 100644
--- a/chrome/views/button.cc
+++ b/chrome/views/button.cc
@@ -7,12 +7,12 @@
 #include <atlbase.h>
 #include <atlapp.h>
 
-#include "base/gfx/image_operations.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/throb_animation.h"
 #include "chrome/views/event.h"
+#include "skia/ext/image_operations.h"
 
 #include "generated_resources.h"
 
@@ -105,7 +105,7 @@ SkBitmap Button::GetImageToPaint() {
   SkBitmap img;
 
   if (!images_[BS_HOT].isNull() && hover_animation_->IsAnimating()) {
-    img = gfx::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL],
+    img = skia::ImageOperations::CreateBlendedBitmap(images_[BS_NORMAL],
               images_[BS_HOT], hover_animation_->GetCurrentValue());
   } else {
     img = images_[GetState()];
diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc
index 549bedf..4d12f3b 100644
--- a/chrome/views/chrome_menu.cc
+++ b/chrome/views/chrome_menu.cc
@@ -10,7 +10,6 @@
 
 #include "base/base_drag_source.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "base/timer.h"
diff --git a/chrome/views/single_split_view.cc b/chrome/views/single_split_view.cc
index 2550c57..a7832b6 100644
--- a/chrome/views/single_split_view.cc
+++ b/chrome/views/single_split_view.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/views/single_split_view.h"
 
-#include "base/gfx/skia_utils.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/views/background.h"
+#include "skia/ext/skia_utils_win.h"
 
 namespace views {
 
@@ -19,7 +19,7 @@ SingleSplitView::SingleSplitView(View* leading, View* trailing)
   AddChildView(trailing);
   set_background(
       views::Background::CreateSolidBackground(
-          gfx::COLORREFToSkColor(GetSysColor(COLOR_3DFACE))));
+          skia::COLORREFToSkColor(GetSysColor(COLOR_3DFACE))));
 }
 
 void SingleSplitView::Layout() {
diff --git a/chrome/views/tabbed_pane.cc b/chrome/views/tabbed_pane.cc
index 2638972..4a63b47 100644
--- a/chrome/views/tabbed_pane.cc
+++ b/chrome/views/tabbed_pane.cc
@@ -7,7 +7,6 @@
 #include <vssym32.h>
 
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/logging.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/chrome_font.h"
diff --git a/chrome/views/table_view.cc b/chrome/views/table_view.cc
index 208a38b..52ed457 100644
--- a/chrome/views/table_view.cc
+++ b/chrome/views/table_view.cc
@@ -9,7 +9,6 @@
 
 #include "base/string_util.h"
 #include "base/win_util.h"
-#include "base/gfx/skia_utils.h"
 #include "chrome/common/gfx/chrome_canvas.h"
 #include "chrome/common/gfx/favicon_size.h"
 #include "chrome/common/gfx/icon_util.h"
@@ -18,6 +17,7 @@
 #include "chrome/views/hwnd_view.h"
 #include "SkBitmap.h"
 #include "SkColorFilter.h"
+#include "skia/ext/skia_utils_win.h"
 
 namespace views {
 
@@ -1175,10 +1175,10 @@ LRESULT TableView::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) {
           custom_cell_font_ = CreateFontIndirect(&logfont);
           SelectObject(draw_info->nmcd.hdc, custom_cell_font_);
           draw_info->clrText = foreground.color_is_set
-                               ? gfx::SkColorToCOLORREF(foreground.color)
+                               ? skia::SkColorToCOLORREF(foreground.color)
                                : CLR_DEFAULT;
           draw_info->clrTextBk = background.color_is_set
-                                 ? gfx::SkColorToCOLORREF(background.color)
+                                 ? skia::SkColorToCOLORREF(background.color)
                                  : CLR_DEFAULT;
           return CDRF_NEWFONT;
         }
@@ -1228,7 +1228,7 @@ LRESULT TableView::OnCustomDraw(NMLVCUSTOMDRAW* draw_info) {
               // background (or rather windows paints background, then invokes
               // this twice). As such, we always fill in the background.
               canvas.drawColor(
-                  gfx::COLORREFToSkColor(GetSysColor(bg_color_index)),
+                  skia::COLORREFToSkColor(GetSysColor(bg_color_index)),
                   SkPorterDuff::kSrc_Mode);
               // + 1 for padding (we declared the image as 18x18 in the list-
               // view when they are 16x16 so we get an extra pixel of padding).
diff --git a/chrome/views/text_field.cc b/chrome/views/text_field.cc
index 24fdc5a..92797a4 100644
--- a/chrome/views/text_field.cc
+++ b/chrome/views/text_field.cc
@@ -12,7 +12,6 @@
 #include <vsstyle.h>
 
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/scoped_clipboard_writer.h"
 #include "base/string_util.h"
 #include "base/win_util.h"
@@ -25,8 +24,8 @@
 #include "chrome/views/hwnd_view.h"
 #include "chrome/views/menu.h"
 #include "chrome/views/widget.h"
-
 #include "generated_resources.h"
+#include "skia/ext/skia_utils_win.h"
 
 using gfx::NativeTheme;
 
@@ -1087,7 +1086,7 @@ void TextField::UpdateEditBackgroundColor() {
 
   COLORREF bg_color;
   if (!use_default_background_color_)
-    bg_color = gfx::SkColorToCOLORREF(background_color_);
+    bg_color = skia::SkColorToCOLORREF(background_color_);
   else
     bg_color = GetSysColor(read_only_ ? COLOR_3DFACE : COLOR_WINDOW);
   edit_->SetBackgroundColor(bg_color);