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

52 files changed, 289 insertions, 319 deletions

diff --git a/base/build/base_gfx.vcproj b/base/build/base_gfx.vcproj
index ef4b5de..70875a9 100644
--- a/base/build/base_gfx.vcproj
+++ b/base/build/base_gfx.vcproj
@@ -122,14 +122,6 @@
 	</References>
 	<Files>
 		<File
-			RelativePath="..\gfx\convolver.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\gfx\convolver.h"
-			>
-		</File>
-		<File
 			RelativePath="..\gfx\gdi_util.cc"
 			>
 		</File>
@@ -138,14 +130,6 @@
 			>
 		</File>
 		<File
-			RelativePath="..\gfx\image_operations.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\gfx\image_operations.h"
-			>
-		</File>
-		<File
 			RelativePath="..\gfx\native_theme.cc"
 			>
 		</File>
@@ -193,14 +177,6 @@
 			RelativePath="..\gfx\size.h"
 			>
 		</File>
-		<File
-			RelativePath="..\gfx\skia_utils.cc"
-			>
-		</File>
-		<File
-			RelativePath="..\gfx\skia_utils.h"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/base/build/base_unittests.vcproj b/base/build/base_unittests.vcproj
index 3c75166..e822992 100644
--- a/base/build/base_unittests.vcproj
+++ b/base/build/base_unittests.vcproj
@@ -396,14 +396,6 @@
 			Name="gfx_tests"
 			>
 			<File
-				RelativePath="..\gfx\convolver_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\gfx\image_operations_unittest.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\gfx\png_codec_unittest.cc"
 				>
 			</File>
diff --git a/base/gfx/base_gfx.scons b/base/gfx/base_gfx.scons
index 7173340..a69206b 100644
--- a/base/gfx/base_gfx.scons
+++ b/base/gfx/base_gfx.scons
@@ -25,16 +25,13 @@ if env['PLATFORM'] == 'win32':
   )
 
 input_files = [
-    'convolver.cc',
     'gdi_util.cc',
-    'image_operations.cc',
     'native_theme.cc',
     'png_decoder.cc',
     'png_encoder.cc',
     'point.cc',
     'rect.cc',
     'size.cc',
-    'skia_utils.cc',
 ]
 
 if env['PLATFORM'] in ('posix', 'darwin'):
@@ -43,7 +40,6 @@ if env['PLATFORM'] in ('posix', 'darwin'):
   to_be_ported_files = [
       'gdi_util.cc',
       'native_theme.cc',
-      'skia_utils.cc',
   ]
   for remove in to_be_ported_files:
     input_files.remove(remove)
diff --git a/base/gfx/img_resize_perftest.cc b/base/gfx/img_resize_perftest.cc
deleted file mode 100644
index 6a4b070..0000000
--- a/base/gfx/img_resize_perftest.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include <stdlib.h>
-#include <time.h>
-
-#include "base/perftimer.h"
-#include "base/gfx/convolver.h"
-#include "base/gfx/image_operations.h"
-#include "base/gfx/image_resizer.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace {
-
-void FillRandomData(char* dest, int byte_count) {
-  srand(static_cast<unsigned>(time(NULL)));
-  for (int i = 0; i < byte_count; i++)
-    dest[i] = rand() * 255 / RAND_MAX;
-}
-
-}  // namespace
-
-// Old code gives [1521, 1519]ms for this, 4000x4000 -> 2100x2100 lanczos8
-
-TEST(ImageResizePerf, BigFilter) {
-  static const int kSrcWidth = 4000;
-  static const int kSrcHeight = 4000;
-  static const int kSrcByteSize = kSrcWidth * kSrcHeight * 4;
-
-  SkBitmap src_bmp;
-  src_bmp.setConfig(SkBitmap::kARGB_8888_Config, kSrcWidth, kSrcHeight);
-  src_bmp.allocPixels();
-  FillRandomData(reinterpret_cast<char*>(src_bmp.getAddr32(0, 0)),
-                 kSrcByteSize);
-
-  // Make the dest size > 1/2 so the 50% optimization doesn't kick in.
-  static const int kDestWidth = 1400;
-  static const int kDestHeight = 1400;
-
-  PerfTimeLogger resize_timer("resize");
-  gfx::ImageResizer resizer(gfx::ImageResizer::LANCZOS3);
-  SkBitmap dest = resizer.Resize(src_bmp, kDestWidth, kDestHeight);
-}
-
-// The original image filter we were using took 523ms for this test, while this
-// one takes 857ms.
-// TODO(brettw) make this at least 64% faster.
-TEST(ImageOperationPerf, BigFilter) {
-  static const int kSrcWidth = 4000;
-  static const int kSrcHeight = 4000;
-  static const int kSrcByteSize = kSrcWidth * kSrcHeight * 4;
-
-  SkBitmap src_bmp;
-  src_bmp.setConfig(SkBitmap::kARGB_8888_Config, kSrcWidth, kSrcHeight);
-  src_bmp.allocPixels();
-  src_bmp.setIsOpaque(true);
-  FillRandomData(reinterpret_cast<char*>(src_bmp.getAddr32(0, 0)),
-                 kSrcByteSize);
-
-  // Make the dest size > 1/2 so the 50% optimization doesn't kick in.
-  static const int kDestWidth = 1400;
-  static const int kDestHeight = 1400;
-
-  PerfTimeLogger resize_timer("resize");
-  SkBitmap dest = gfx::ImageOperations::Resize(src_bmp,
-      gfx::ImageOperations::RESIZE_LANCZOS3, (float)kDestWidth / (float)kSrcWidth,
-      (float)kDestHeight / (float)kSrcHeight);
-}
-
diff --git a/base/gfx/native_theme.cc b/base/gfx/native_theme.cc
index 71289d8..8c7914d 100644
--- a/base/gfx/native_theme.cc
+++ b/base/gfx/native_theme.cc
@@ -10,11 +10,11 @@
 #include <vssym32.h>
 
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/skia_utils.h"
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
 #include "skia/ext/platform_canvas.h"
+#include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkShader.h"
 
 namespace gfx {
@@ -213,8 +213,8 @@ HRESULT NativeTheme::PaintScrollbarTrack(HDC hdc,
   } else {
     // Create a 2x2 checkerboard pattern using the 3D face and highlight
     // colors.
-    SkColor face = COLORREFToSkColor(color3DFace);
-    SkColor highlight = COLORREFToSkColor(GetSysColor(COLOR_3DHILIGHT));
+    SkColor face = skia::COLORREFToSkColor(color3DFace);
+    SkColor highlight = skia::COLORREFToSkColor(GetSysColor(COLOR_3DHILIGHT));
     SkColor buffer[] = { face, highlight, highlight, face };
     SkBitmap bitmap;
     bitmap.setConfig(SkBitmap::kARGB_8888_Config, 2, 2);
@@ -232,7 +232,7 @@ HRESULT NativeTheme::PaintScrollbarTrack(HDC hdc,
     shader->setLocalMatrix(matrix);
     SkPaint paint;
     paint.setShader(shader)->unref();
-    canvas->drawIRect(RECTToSkIRect(*target_rect), paint);
+    canvas->drawIRect(skia::RECTToSkIRect(*target_rect), paint);
   }
   if (classic_state & DFCS_PUSHED)
     InvertRect(hdc, target_rect);
@@ -466,7 +466,7 @@ HRESULT NativeTheme::GetThemeColor(ThemeName theme,
     COLORREF color_ref;
     if (get_theme_color_(handle, part_id, state_id, prop_id, &color_ref) ==
         S_OK) {
-      *color = gfx::COLORREFToSkColor(color_ref);
+      *color = skia::COLORREFToSkColor(color_ref);
       return S_OK;
     }
   }
@@ -480,7 +480,7 @@ SkColor NativeTheme::GetThemeColorWithDefault(ThemeName theme,
                                               int default_sys_color) const {
   SkColor color;
   if (GetThemeColor(theme, part_id, state_id, prop_id, &color) != S_OK)
-    color = gfx::COLORREFToSkColor(GetSysColor(default_sys_color));
+    color = skia::COLORREFToSkColor(GetSysColor(default_sys_color));
   return color;
 }
 
diff --git a/base/gfx/skia_utils.cc b/base/gfx/skia_utils.cc
deleted file mode 100644
index 7b70056..0000000
--- a/base/gfx/skia_utils.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/gfx/skia_utils.h"
-
-#include "base/logging.h"
-#include "SkRect.h"
-#include "SkGradientShader.h"
-
-namespace {
-
-COMPILE_ASSERT(offsetof(RECT, left) == offsetof(SkIRect, fLeft), o1);
-COMPILE_ASSERT(offsetof(RECT, top) == offsetof(SkIRect, fTop), o2);
-COMPILE_ASSERT(offsetof(RECT, right) == offsetof(SkIRect, fRight), o3);
-COMPILE_ASSERT(offsetof(RECT, bottom) == offsetof(SkIRect, fBottom), o4);
-COMPILE_ASSERT(sizeof(RECT().left) == sizeof(SkIRect().fLeft), o5);
-COMPILE_ASSERT(sizeof(RECT().top) == sizeof(SkIRect().fTop), o6);
-COMPILE_ASSERT(sizeof(RECT().right) == sizeof(SkIRect().fRight), o7);
-COMPILE_ASSERT(sizeof(RECT().bottom) == sizeof(SkIRect().fBottom), o8);
-COMPILE_ASSERT(sizeof(RECT) == sizeof(SkIRect), o9);
-
-}  // namespace
-
-namespace gfx {
-
-POINT SkPointToPOINT(const SkPoint& point) {
-  POINT win_point = { SkScalarRound(point.fX), SkScalarRound(point.fY) };
-  return win_point;
-}
-
-SkRect RECTToSkRect(const RECT& rect) {
-  SkRect sk_rect = { SkIntToScalar(rect.left), SkIntToScalar(rect.top),
-                     SkIntToScalar(rect.right), SkIntToScalar(rect.bottom) };
-  return sk_rect;
-}
-
-SkShader* CreateGradientShader(int start_point,
-                               int end_point,
-                               SkColor start_color,
-                               SkColor end_color) {
-  SkColor grad_colors[2] = { start_color, end_color};
-  SkPoint grad_points[2];
-  grad_points[0].set(SkIntToScalar(0), SkIntToScalar(start_point));
-  grad_points[1].set(SkIntToScalar(0), SkIntToScalar(end_point));
-
-  return SkGradientShader::CreateLinear(
-      grad_points, grad_colors, NULL, 2, SkShader::kRepeat_TileMode);
-}
-
-
-SkColor COLORREFToSkColor(COLORREF color) {
-#ifndef _MSC_VER
-  return SkColorSetRGB(GetRValue(color), GetGValue(color), GetBValue(color));
-#else
-  // ARGB = 0xFF000000 | ((0BGR -> RGB0) >> 8)
-  return 0xFF000000u | (_byteswap_ulong(color) >> 8);
-#endif
-}
-
-COLORREF SkColorToCOLORREF(SkColor color) {
-  // Currently, Alpha is always 255 or the color is 0 so there is no need to
-  // demultiply the channels. If this DCHECK() is ever hit, the full
-  // (SkColorGetX(color) * 255 / a) will have to be added in the conversion.
-  DCHECK((0xFF == SkColorGetA(color)) || (0 == color));
-#ifndef _MSC_VER
-  return RGB(SkColorGetR(color), SkColorGetG(color), SkColorGetB(color));
-#else
-  // 0BGR = ((ARGB -> BGRA) >> 8)
-  return (_byteswap_ulong(color) >> 8);
-#endif
-}
-
-}  // namespace gfx
-
diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index cfef6a6..4cd2d76 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -8,7 +8,6 @@
 
 #include "base/base_drag_source.h"
 #include "base/clipboard.h"
-#include "base/gfx/skia_utils.h"
 #include "base/iat_patch.h"
 #include "base/ref_counted.h"
 #include "base/scoped_clipboard_writer.h"
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index 262c507..5af7c47 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -11,7 +11,6 @@
 #include "base/base_drag_source.h"
 #include "base/file_util.h"
 #include "base/scoped_clipboard_writer.h"
-#include "base/gfx/image_operations.h"
 #include "base/string_util.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/app/theme/theme_resources.h"
@@ -25,6 +24,7 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/views/view.h"
 #include "generated_resources.h"
+#include "skia/ext/image_operations.h"
 #include "SkPath.h"
 #include "SkShader.h"
 
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc
index f77b05c..2f05357 100644
--- a/chrome/browser/fav_icon_helper.cc
+++ b/chrome/browser/fav_icon_helper.cc
@@ -4,7 +4,6 @@
 
 #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"
@@ -13,6 +12,7 @@
 #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 gfx::ImageOperations::Resize(
-          image, gfx::ImageOperations::RESIZE_LANCZOS3,
+    return skia::ImageOperations::Resize(
+          image, skia::ImageOperations::RESIZE_LANCZOS3,
           gfx::Size(width, height));
   }
   return image;
diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc
index 3ce8996..a329cfb 100644
--- a/chrome/browser/importer/importer.cc
+++ b/chrome/browser/importer/importer.cc
@@ -8,7 +8,6 @@
 #include <set>
 
 #include "base/file_util.h"
-#include "base/gfx/image_operations.h"
 #include "base/gfx/png_encoder.h"
 #include "base/string_util.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
@@ -31,6 +30,7 @@
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
 #include "chrome/views/window.h"
+#include "skia/ext/image_operations.h"
 #include "webkit/glue/image_decoder.h"
 
 #include "generated_resources.h"
@@ -384,8 +384,8 @@ bool Importer::ReencodeFavicon(const unsigned char* src_data, size_t src_len,
     int new_width = decoded.width();
     int new_height = decoded.height();
     calc_favicon_target_size(&new_width, &new_height);
-    decoded = gfx::ImageOperations::Resize(
-        decoded, gfx::ImageOperations::RESIZE_LANCZOS3,
+    decoded = skia::ImageOperations::Resize(
+        decoded, skia::ImageOperations::RESIZE_LANCZOS3,
         gfx::Size(new_width, new_height));
   }
 
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index aaca5af..49d817b 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -7,7 +7,6 @@
 #include <limits>
 
 #include "base/base_drag_source.h"
-#include "base/gfx/skia_utils.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
@@ -45,6 +44,7 @@
 #include "chrome/views/widget.h"
 #include "chrome/views/window.h"
 #include "generated_resources.h"
+#include "skia/ext/skia_utils.h"
 
 using views::BaseButton;
 using views::DropTargetEvent;
@@ -255,7 +255,7 @@ class BookmarkButton : public views::TextButton {
     // the parent's actual bounds because they differ from what is painted.
     SkPaint paint;
     paint.setAlpha(static_cast<int>((1.0 - animation_value) * 255));
-    paint.setShader(gfx::CreateGradientShader(0,
+    paint.setShader(skia::CreateGradientShader(0,
         view->height() + kTopMargin + kBottomMargin,
         kTopBorderColor,
         kBackgroundColor))->safeUnref();
@@ -603,16 +603,16 @@ class ButtonSeparatorView : public views::View {
 
   virtual void Paint(ChromeCanvas* canvas) {
     SkPaint paint;
-    paint.setShader(gfx::CreateGradientShader(0,
-                                              height() / 2,
-                                              kTopBorderColor,
-                                              kSeparatorColor))->safeUnref();
+    paint.setShader(skia::CreateGradientShader(0,
+                                               height() / 2,
+                                               kTopBorderColor,
+                                               kSeparatorColor))->safeUnref();
     SkRect rc = {SkIntToScalar(kSeparatorStartX),  SkIntToScalar(0),
                  SkIntToScalar(1), SkIntToScalar(height() / 2) };
     canvas->drawRect(rc, paint);
 
     SkPaint paint_down;
-    paint_down.setShader(gfx::CreateGradientShader(height() / 2,
+    paint_down.setShader(skia::CreateGradientShader(height() / 2,
         height(),
         kSeparatorColor,
         kBackgroundColor))->safeUnref();
@@ -904,10 +904,10 @@ void BookmarkBarView::Paint(ChromeCanvas* canvas) {
     // Draw our background.
     SkPaint paint;
     paint.setAntiAlias(true);
-    paint.setShader(gfx::CreateGradientShader(0,
-                                              height(),
-                                              kTopBorderColor,
-                                              kBackgroundColor))->safeUnref();
+    paint.setShader(skia::CreateGradientShader(0,
+                                               height(),
+                                               kTopBorderColor,
+                                               kBackgroundColor))->safeUnref();
 
     canvas->drawRoundRect(rect,
                           SkDoubleToScalar(roundness),
@@ -924,10 +924,10 @@ void BookmarkBarView::Paint(ChromeCanvas* canvas) {
                           SkDoubleToScalar(roundness), border_paint);
   } else {
     SkPaint paint;
-    paint.setShader(gfx::CreateGradientShader(0,
-                                              height(),
-                                              kTopBorderColor,
-                                              kBackgroundColor))->safeUnref();
+    paint.setShader(skia::CreateGradientShader(0,
+                                               height(),
+                                               kTopBorderColor,
+                                               kBackgroundColor))->safeUnref();
     canvas->FillRectInt(0, 0, width(), height(), paint);
 
     canvas->FillRectInt(kTopBorderColor, 0, 0, width(), 1);
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index c0c307e..684c252 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -6,7 +6,6 @@
 
 #include <algorithm>
 
-#include "base/gfx/skia_utils.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
@@ -31,8 +30,8 @@
 #include "chrome/views/menu_button.h"
 #include "chrome/views/single_split_view.h"
 #include "chrome/views/window.h"
-
 #include "generated_resources.h"
+#include "skia/ext/skia_utils.h"
 
 // If non-null, there is an open editor and this is the window it is contained
 // in it.
@@ -299,7 +298,7 @@ void BookmarkManagerView::PaintBackground(ChromeCanvas* canvas) {
   canvas->drawColor(kBackgroundColorBottom, SkPorterDuff::kSrc_Mode);
 
   SkPaint paint;
-  paint.setShader(gfx::CreateGradientShader(0, kBackgroundGradientHeight,
+  paint.setShader(skia::CreateGradientShader(0, kBackgroundGradientHeight,
       kBackgroundColorTop,
       kBackgroundColorBottom))->safeUnref();
   canvas->FillRectInt(0, 0, width(), kBackgroundGradientHeight, paint);
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index e4e443d..a534a4b 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -11,7 +11,6 @@
 
 #include "base/file_util.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/shell_dialogs.h"
@@ -31,6 +30,7 @@
 #include "chrome/views/text_field.h"
 #include "chrome/views/widget.h"
 #include "generated_resources.h"
+#include "skia/ext/skia_utils_win.h"
 #include "skia/include/SkBitmap.h"
 
 namespace {
@@ -102,7 +102,7 @@ void FileDisplayArea::Paint(ChromeCanvas* canvas) {
   RECT rect = { 0, 0, width(), height() };
   gfx::NativeTheme::instance()->PaintTextField(
       dc, EP_EDITTEXT, ETS_READONLY, 0, &rect,
-      gfx::SkColorToCOLORREF(text_field_background_color_), true, true);
+      skia::SkColorToCOLORREF(text_field_background_color_), true, true);
   canvas->endPlatformPaint();
   canvas->DrawBitmapInt(default_folder_icon_, icon_bounds_.x(),
                         icon_bounds_.y());
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index b41fb55..d73191b 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -10,7 +10,6 @@
 
 #include "base/file_util.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/app/locales/locale_settings.h"
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index 118ac10..e9a1e8b 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -11,7 +11,6 @@
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "base/string_util.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index bdf76ea..9ff07f5 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -8,7 +8,6 @@
 #include "chrome/browser/views/options/options_group_view.h"
 
 #include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/gfx/chrome_font.h"
diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc
index 7b34bcb..e22aea2 100644
--- a/chrome/browser/views/sad_tab_view.cc
+++ b/chrome/browser/views/sad_tab_view.cc
@@ -10,6 +10,7 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/resource_bundle.h"
 #include "generated_resources.h"
+#include "skia/ext/skia_utils.h"
 #include "skia/include/SkGradientShader.h"
 
 static const int kSadTabOffset = -64;
@@ -34,17 +35,9 @@ SadTabView::SadTabView() {
   InitClass();
 }
 
-static SkShader* CreateGradientShader(int end_point) {
-  SkColor grad_colors[2] = { kBackgroundColor, kBackgroundEndColor };
-  SkPoint grad_points[2];
-  grad_points[0].set(SkIntToScalar(0), SkIntToScalar(0));
-  grad_points[1].set(SkIntToScalar(0), SkIntToScalar(end_point));
-  return SkGradientShader::CreateLinear(
-      grad_points, grad_colors, NULL, 2, SkShader::kRepeat_TileMode);
-}
-
 void SadTabView::Paint(ChromeCanvas* canvas) {
-  SkShader* background_shader = CreateGradientShader(height());
+  SkShader* background_shader = skia::CreateGradientShader(
+      0, height(), kBackgroundColor, kBackgroundEndColor);
   SkPaint paint;
   paint.setShader(background_shader);
   background_shader->unref();
diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc
index f1d00b3..4581f6d 100644
--- a/chrome/browser/views/tabs/tab_renderer.cc
+++ b/chrome/browser/views/tabs/tab_renderer.cc
@@ -6,7 +6,6 @@
 
 #include "chrome/browser/views/tabs/tab_renderer.h"
 
-#include "base/gfx/image_operations.h"
 #include "chrome/app/theme/theme_resources.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
@@ -17,6 +16,7 @@
 #include "chrome/common/resource_bundle.h"
 #include "chrome/common/win_util.h"
 #include "generated_resources.h"
+#include "skia/ext/image_operations.h"
 
 static const int kLeftPadding = 16;
 static const int kTopPadding = 6;
@@ -586,13 +586,13 @@ void TabRenderer::PaintActiveTabBackground(ChromeCanvas* canvas) {
 void TabRenderer::PaintHoverTabBackground(ChromeCanvas* canvas,
                                           double opacity) {
   bool is_otr = data_.off_the_record;
-  SkBitmap left = gfx::ImageOperations::CreateBlendedBitmap(
+  SkBitmap left = skia::ImageOperations::CreateBlendedBitmap(
                   (is_otr ? *tab_inactive_otr_l : *tab_inactive_l),
                   *tab_hover_l, opacity);
-  SkBitmap center = gfx::ImageOperations::CreateBlendedBitmap(
+  SkBitmap center = skia::ImageOperations::CreateBlendedBitmap(
                    (is_otr ? *tab_inactive_otr_c : *tab_inactive_c),
                     *tab_hover_c, opacity);
-  SkBitmap right = gfx::ImageOperations::CreateBlendedBitmap(
+  SkBitmap right = skia::ImageOperations::CreateBlendedBitmap(
                    (is_otr ? *tab_inactive_otr_r : *tab_inactive_r),
                    *tab_hover_r, opacity);
 
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])));
   }
 
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 23fab18..e28a6c7 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -10,7 +10,6 @@
 
 #include "base/command_line.h"
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/image_operations.h"
 #include "base/gfx/native_theme.h"
 #include "base/gfx/png_encoder.h"
 #include "base/string_piece.h"
@@ -38,6 +37,7 @@
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "skia/ext/bitmap_platform_device.h"
+#include "skia/ext/image_operations.h"
 #include "skia/ext/vector_canvas.h"
 #include "webkit/default_plugin/default_plugin_shared.h"
 #include "webkit/glue/dom_operations.h"
@@ -57,7 +57,6 @@
 #include "webkit/glue/weburlrequest.h"
 #include "webkit/glue/webview.h"
 #include "webkit/glue/plugins/webplugin_delegate_impl.h"
-//#include "webkit/port/platform/graphics/PlatformContextSkia.h"
 
 #include "generated_resources.h"
 
@@ -798,8 +797,8 @@ bool RenderView::CaptureThumbnail(WebFrame* frame,
   device->accessBitmap(false).extractSubset(&subset, src_rect);
 
   // Resample the subset that we want to get it the right size.
-  *thumbnail = gfx::ImageOperations::Resize(
-      subset, gfx::ImageOperations::RESIZE_LANCZOS3, gfx::Size(w, h));
+  *thumbnail = skia::ImageOperations::Resize(
+      subset, skia::ImageOperations::RESIZE_LANCZOS3, gfx::Size(w, h));
 
   score->boring_score = CalculateBoringScore(thumbnail);
 
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);
diff --git a/skia/SConscript b/skia/SConscript
index 00b8e1b..fbafc92 100644
--- a/skia/SConscript
+++ b/skia/SConscript
@@ -152,6 +152,10 @@ input_files = [
   'sgl/SkUtils.cpp',
   'sgl/SkWriter32.cpp',
   'sgl/SkXfermode.cpp',
+
+  'ext/convolver.cc',
+  'ext/image_operations.cc',
+  'ext/skia_utils.cc',
 ]
 
 if env['PLATFORM'] == 'posix':
@@ -176,11 +180,13 @@ if env['PLATFORM'] == 'darwin':
   input_files.append('ext/bitmap_platform_device_mac.cc')
   input_files.append('ext/platform_canvas_mac.cc')
   input_files.append('ext/platform_device_mac.cc')
+  input_files.append('ext/skia_utils_mac.cc')
 
 if env['PLATFORM'] == 'win32':
   input_files.append('ext/bitmap_platform_device_win.cc')
   input_files.append('ext/platform_canvas_win.cc')
   input_files.append('ext/platform_device_win.cc')
+  input_files.append('ext/skia_utils_win.cc')
   input_files.append('ext/vector_canvas.cc')
   input_files.append('ext/vector_device.cc')
 
diff --git a/skia/ext/bitmap_platform_device_mac.cc b/skia/ext/bitmap_platform_device_mac.cc
index d4458d7..52ce586 100755
--- a/skia/ext/bitmap_platform_device_mac.cc
+++ b/skia/ext/bitmap_platform_device_mac.cc
@@ -10,8 +10,8 @@
 #include "SkRegion.h"
 #include "SkUtils.h"
 
-#include "base/gfx/skia_utils_mac.h"
 #include "base/logging.h"
+#include "skia/ext/skia_utils_mac.h"
 
 namespace gfx {
 
diff --git a/base/gfx/convolver.cc b/skia/ext/convolver.cc
index fd3503f..c854019 100644
--- a/base/gfx/convolver.cc
+++ b/skia/ext/convolver.cc
@@ -4,11 +4,12 @@
 
 #include <algorithm>
 
+#include "skia/ext/convolver.h"
+
 #include "base/basictypes.h"
-#include "base/gfx/convolver.h"
 #include "base/logging.h"
 
-namespace gfx {
+namespace skia {
 
 namespace {
 
@@ -331,5 +332,5 @@ void BGRAConvolve2D(const uint8* source_data,
   }
 }
 
-}  // namespace gfx
+}  // namespace skia
 
diff --git a/base/gfx/convolver.h b/skia/ext/convolver.h
index 12c9228..62c1e30 100644
--- a/base/gfx/convolver.h
+++ b/skia/ext/convolver.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_GFX_CONVOLVER_H__
-#define BASE_GFX_CONVOLVER_H__
+#ifndef SKIA_EXT_CONVOLVER_H_
+#define SKIA_EXT_CONVOLVER_H_
 
 #include <vector>
 
@@ -14,7 +14,7 @@
 #undef FloatToFixed
 #endif
 
-namespace gfx {
+namespace skia {
 
 // Represents a filter in one dimension. Each output pixel has one entry in this
 // object for the filter values contributing to it. You build up the filter
@@ -131,7 +131,7 @@ void BGRAConvolve2D(const uint8* source_data,
                     const ConvolusionFilter1D& yfilter,
                     uint8* output);
 
-}  // namespace gfx
+}  // namespace skia
 
-#endif  // BASE_GFX_CONVOLVER_H__
+#endif  // SKIA_EXT_CONVOLVER_H_
 
diff --git a/base/gfx/convolver_unittest.cc b/skia/ext/convolver_unittest.cc
index 0a30a6b..c0ae734 100644
--- a/base/gfx/convolver_unittest.cc
+++ b/skia/ext/convolver_unittest.cc
@@ -6,10 +6,11 @@
 #include <time.h>
 #include <vector>
 
-#include "base/gfx/convolver.h"
+#include "skia/ext/convolver.h"
+
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace gfx {
+namespace skia {
 
 namespace {
 
@@ -123,5 +124,5 @@ TEST(Convolver, Halve) {
   }
 }
 
-}  // namespace gfx
+}  // namespace skia
 
diff --git a/base/gfx/image_operations.cc b/skia/ext/image_operations.cc
index a60d19e..9eab6e5 100644
--- a/base/gfx/image_operations.cc
+++ b/skia/ext/image_operations.cc
@@ -7,16 +7,20 @@
 #include <limits>
 #include <vector>
 
-#include "base/gfx/image_operations.h"
+#include "skia/ext/image_operations.h"
 
-#include "base/gfx/convolver.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/stack_container.h"
+#include "skia/ext/convolver.h"
 #include "SkBitmap.h"
 
-namespace gfx {
+// TODO(brettw) this should be removed when the base/gfx dependencies are
+// removed.
+using namespace gfx;
+
+namespace skia {
 
 namespace {
 
@@ -113,7 +117,7 @@ class ResizeFilter {
       case ImageOperations::RESIZE_BOX:
         return EvalBox(pos);
       case ImageOperations::RESIZE_LANCZOS3:
-        return EvalLanczos(3, pos);
+        return EvalLanczos(2, pos);
       default:
         NOTREACHED();
         return 0;
@@ -358,5 +362,5 @@ SkBitmap ImageOperations::CreateBlendedBitmap(const SkBitmap& first,
   return blended;
 }
 
-}  // namespace gfx
+}  // namespace skia
 
diff --git a/base/gfx/image_operations.h b/skia/ext/image_operations.h
index 826e651..60a8da7c 100644
--- a/base/gfx/image_operations.h
+++ b/skia/ext/image_operations.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_GFX_IMAGE_OPERATIONS_H__
-#define BASE_GFX_IMAGE_OPERATIONS_H__
+#ifndef SKIA_EXT_IMAGE_OPERATIONS_H_
+#define SKIA_EXT_IMAGE_OPERATIONS_H_
 
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
 
 class SkBitmap;
 
-namespace gfx {
+namespace skia {
 
 class ImageOperations {
  public:
@@ -37,14 +37,14 @@ class ImageOperations {
   // The destination subset must be smaller than the destination image.
   static SkBitmap Resize(const SkBitmap& source,
                          ResizeMethod method,
-                         const Size& dest_size,
-                         const Rect& dest_subset);
+                         const gfx::Size& dest_size,
+                         const gfx::Rect& dest_subset);
 
   // Alternate version for resizing and returning the entire bitmap rather than
   // a subset.
   static SkBitmap Resize(const SkBitmap& source,
                          ResizeMethod method,
-                         const Size& dest_size);
+                         const gfx::Size& dest_size);
 
 
   // Create a bitmap that is a blend of two others. The alpha argument
@@ -57,7 +57,7 @@ class ImageOperations {
   ImageOperations();  // Class for scoping only.
 };
 
-}  // namespace gfx
+}  // namespace skia
 
-#endif  // BASE_GFX_IMAGE_OPERATIONS_H__
+#endif  // SKIA_EXT_IMAGE_OPERATIONS_H_
 
diff --git a/base/gfx/image_operations_unittest.cc b/skia/ext/image_operations_unittest.cc
index a15e648..7a52d1f 100644
--- a/base/gfx/image_operations_unittest.cc
+++ b/skia/ext/image_operations_unittest.cc
@@ -4,7 +4,8 @@
 
 #include <stdlib.h>
 
-#include "base/gfx/image_operations.h"
+#include "skia/ext/image_operations.h"
+
 #include "testing/gtest/include/gtest/gtest.h"
 #include "SkBitmap.h"
 
@@ -67,8 +68,8 @@ TEST(ImageOperations, Halve) {
   FillDataToBitmap(src_w, src_h, &src);
 
   // Do a halving of the full bitmap.
-  SkBitmap actual_results = gfx::ImageOperations::Resize(
-      src, gfx::ImageOperations::RESIZE_BOX, gfx::Size(src_w / 2, src_h / 2));
+  SkBitmap actual_results = skia::ImageOperations::Resize(
+      src, skia::ImageOperations::RESIZE_BOX, gfx::Size(src_w / 2, src_h / 2));
   ASSERT_EQ(src_w / 2, actual_results.width());
   ASSERT_EQ(src_h / 2, actual_results.height());
 
@@ -96,16 +97,16 @@ TEST(ImageOperations, HalveSubset) {
   FillDataToBitmap(src_w, src_h, &src);
 
   // Do a halving of the full bitmap.
-  SkBitmap full_results = gfx::ImageOperations::Resize(
-      src, gfx::ImageOperations::RESIZE_BOX, gfx::Size(src_w / 2, src_h / 2));
+  SkBitmap full_results = skia::ImageOperations::Resize(
+      src, skia::ImageOperations::RESIZE_BOX, gfx::Size(src_w / 2, src_h / 2));
   ASSERT_EQ(src_w / 2, full_results.width());
   ASSERT_EQ(src_h / 2, full_results.height());
 
   // Now do a halving of a a subset, recall the destination subset is in the
   // destination coordinate system (max = half of the original image size).
   gfx::Rect subset_rect(2, 3, 3, 6);
-  SkBitmap subset_results = gfx::ImageOperations::Resize(
-      src, gfx::ImageOperations::RESIZE_BOX,
+  SkBitmap subset_results = skia::ImageOperations::Resize(
+      src, skia::ImageOperations::RESIZE_BOX,
       gfx::Size(src_w / 2, src_h / 2), subset_rect);
   ASSERT_EQ(subset_rect.width(), subset_results.width());
   ASSERT_EQ(subset_rect.height(), subset_results.height());
@@ -132,8 +133,8 @@ TEST(ImageOperations, ResampleToSame) {
 
   // Do a resize of the full bitmap to the same size. The lanczos filter is good
   // enough that we should get exactly the same image for output.
-  SkBitmap results = gfx::ImageOperations::Resize(
-      src, gfx::ImageOperations::RESIZE_LANCZOS3, gfx::Size(src_w, src_h));
+  SkBitmap results = skia::ImageOperations::Resize(
+      src, skia::ImageOperations::RESIZE_LANCZOS3, gfx::Size(src_w, src_h));
   ASSERT_EQ(src_w, results.width());
   ASSERT_EQ(src_h, results.height());
 
diff --git a/skia/ext/platform_device_mac.cc b/skia/ext/platform_device_mac.cc
index 9539e0f..3cc6fb4 100755
--- a/skia/ext/platform_device_mac.cc
+++ b/skia/ext/platform_device_mac.cc
@@ -5,7 +5,7 @@
 #include "skia/ext/bitmap_platform_device_mac.h"
 
 #include "base/logging.h"
-#include "base/gfx/skia_utils_mac.h"
+#include "skia/ext/skia_utils_mac.h"
 #include "SkMatrix.h"
 #include "SkPath.h"
 #include "SkUtils.h"
diff --git a/skia/ext/platform_device_win.cc b/skia/ext/platform_device_win.cc
index 15201c0..1e8301d 100644
--- a/skia/ext/platform_device_win.cc
+++ b/skia/ext/platform_device_win.cc
@@ -5,11 +5,14 @@
 #include "skia/ext/platform_device_win.h"
 
 #include "base/logging.h"
-#include "base/gfx/skia_utils.h"
 #include "SkMatrix.h"
 #include "SkPath.h"
 #include "SkRegion.h"
 #include "SkUtils.h"
+#include "skia/ext/skia_utils_win.h"
+
+// TODO(brettw) remove this when this file is converted to namespace skia.
+using namespace skia;
 
 namespace gfx {
 
diff --git a/skia/ext/skia_utils.cc b/skia/ext/skia_utils.cc
new file mode 100644
index 0000000..651670e
--- /dev/null
+++ b/skia/ext/skia_utils.cc
@@ -0,0 +1,26 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "skia/ext/skia_utils_win.h"
+
+#include "SkRect.h"
+#include "SkGradientShader.h"
+
+namespace skia {
+
+SkShader* CreateGradientShader(int start_point,
+                               int end_point,
+                               SkColor start_color,
+                               SkColor end_color) {
+  SkColor grad_colors[2] = { start_color, end_color};
+  SkPoint grad_points[2];
+  grad_points[0].set(SkIntToScalar(0), SkIntToScalar(start_point));
+  grad_points[1].set(SkIntToScalar(0), SkIntToScalar(end_point));
+
+  return SkGradientShader::CreateLinear(
+      grad_points, grad_colors, NULL, 2, SkShader::kRepeat_TileMode);
+}
+
+}  // namespace skia
+
diff --git a/skia/ext/skia_utils.h b/skia/ext/skia_utils.h
new file mode 100644
index 0000000..acfab28
--- /dev/null
+++ b/skia/ext/skia_utils.h
@@ -0,0 +1,23 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// This file contains cross-platform Skia helper routines.
+
+#ifndef SKIA_EXT_SKIA_UTILS_H_
+#define SKIA_EXT_SKIA_UTILS_H_
+
+#include "SkShader.h"
+
+namespace skia {
+
+// Creates a vertical gradient shader. The caller owns the shader.
+SkShader* CreateGradientShader(int start_point,
+                               int end_point,
+                               SkColor start_color,
+                               SkColor end_color);
+
+}  // namespace skia
+
+#endif  // SKIA_EXT_SKIA_UTILS_H_
+
diff --git a/base/gfx/skia_utils_mac.cc b/skia/ext/skia_utils_mac.cc
index b5962c3..a7610aa 100644
--- a/base/gfx/skia_utils_mac.cc
+++ b/skia/ext/skia_utils_mac.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/gfx/skia_utils_mac.h"
+#include "skia/ext/skia_utils_mac.h"
 
 #include "base/logging.h"
 #include "SkMatrix.h"
diff --git a/base/gfx/skia_utils_mac.h b/skia/ext/skia_utils_mac.h
index a99905f..a99905f 100644
--- a/base/gfx/skia_utils_mac.h
+++ b/skia/ext/skia_utils_mac.h
diff --git a/skia/ext/skia_utils_win.cc b/skia/ext/skia_utils_win.cc
new file mode 100644
index 0000000..f695a63
--- /dev/null
+++ b/skia/ext/skia_utils_win.cc
@@ -0,0 +1,59 @@
+// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <windows.h>
+
+#include "skia/ext/skia_utils_win.h"
+
+#include "SkRect.h"
+#include "SkGradientShader.h"
+
+namespace {
+
+// Compiler assert from base/logging.h
+template <bool>
+struct CompileAssert {
+};
+#undef COMPILE_ASSERT
+#define COMPILE_ASSERT(expr, msg) \
+  typedef CompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1]
+
+COMPILE_ASSERT(SK_OFFSETOF(RECT, left) == SK_OFFSETOF(SkIRect, fLeft), o1);
+COMPILE_ASSERT(SK_OFFSETOF(RECT, top) == SK_OFFSETOF(SkIRect, fTop), o2);
+COMPILE_ASSERT(SK_OFFSETOF(RECT, right) == SK_OFFSETOF(SkIRect, fRight), o3);
+COMPILE_ASSERT(SK_OFFSETOF(RECT, bottom) == SK_OFFSETOF(SkIRect, fBottom), o4);
+COMPILE_ASSERT(sizeof(RECT().left) == sizeof(SkIRect().fLeft), o5);
+COMPILE_ASSERT(sizeof(RECT().top) == sizeof(SkIRect().fTop), o6);
+COMPILE_ASSERT(sizeof(RECT().right) == sizeof(SkIRect().fRight), o7);
+COMPILE_ASSERT(sizeof(RECT().bottom) == sizeof(SkIRect().fBottom), o8);
+COMPILE_ASSERT(sizeof(RECT) == sizeof(SkIRect), o9);
+
+}  // namespace
+
+namespace skia {
+
+POINT SkPointToPOINT(const SkPoint& point) {
+  POINT win_point = { SkScalarRound(point.fX), SkScalarRound(point.fY) };
+  return win_point;
+}
+
+SkRect RECTToSkRect(const RECT& rect) {
+  SkRect sk_rect = { SkIntToScalar(rect.left), SkIntToScalar(rect.top),
+                     SkIntToScalar(rect.right), SkIntToScalar(rect.bottom) };
+  return sk_rect;
+}
+
+SkColor COLORREFToSkColor(COLORREF color) {
+  return SkColorSetRGB(GetRValue(color), GetGValue(color), GetBValue(color));
+}
+
+COLORREF SkColorToCOLORREF(SkColor color) {
+  // Currently, Alpha is always 255 or the color is 0 so there is no need to
+  // demultiply the channels. If this is needed, (SkColorGetX(color) * 255 / a)
+  // will have to be added in the conversion.
+  return RGB(SkColorGetR(color), SkColorGetG(color), SkColorGetB(color));
+}
+
+}  // namespace skia
+
diff --git a/base/gfx/skia_utils.h b/skia/ext/skia_utils_win.h
index 8509072..297608a 100644
--- a/base/gfx/skia_utils.h
+++ b/skia/ext/skia_utils_win.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_GFX_SKIA_UTILS_H__
-#define BASE_GFX_SKIA_UTILS_H__
+#ifndef SKIA_EXT_SKIA_UTILS_WIN_H_
+#define SKIA_EXT_SKIA_UTILS_WIN_H_
 
 #include "SkColor.h"
 #include "SkShader.h"
@@ -16,7 +16,7 @@ typedef DWORD COLORREF;
 typedef struct tagPOINT POINT;
 typedef struct tagRECT RECT;
 
-namespace gfx {
+namespace skia {
 
 // Converts a Skia point to a Windows POINT.
 POINT SkPointToPOINT(const SkPoint& point);
@@ -50,7 +50,7 @@ SkColor COLORREFToSkColor(COLORREF color);
 // Converts ARGB to COLORREFs (0BGR).
 COLORREF SkColorToCOLORREF(SkColor color);
 
-}  // namespace gfx
+}  // namespace skia
 
-#endif
+#endif  // SKIA_EXT_SKIA_UTILS_WIN_H_
 
diff --git a/skia/ext/vector_device.cc b/skia/ext/vector_device.cc
index a587e0c..2dc0c30 100644
--- a/skia/ext/vector_device.cc
+++ b/skia/ext/vector_device.cc
@@ -5,12 +5,14 @@
 #include "skia/ext/vector_device.h"
 
 #include "base/gfx/gdi_util.h"
-#include "base/gfx/skia_utils.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
-
+#include "skia/ext/skia_utils_win.h"
 #include "SkUtils.h"
 
+// TOOD(brettw) remove this when this file is changed over to namespace skia.
+using namespace skia;
+
 namespace gfx {
 
 VectorDevice* VectorDevice::create(HDC dc, int width, int height) {
diff --git a/skia/skia.vcproj b/skia/skia.vcproj
index 5e06d73..65453c1 100644
--- a/skia/skia.vcproj
+++ b/skia/skia.vcproj
@@ -1321,6 +1321,22 @@
 				>
 			</File>
 			<File
+				RelativePath=".\ext\convolver.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\ext\convolver.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ext\image_operations.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\ext\image_operations.h"
+				>
+			</File>
+			<File
 				RelativePath=".\ext\platform_canvas.h"
 				>
 			</File>
@@ -1345,6 +1361,22 @@
 				>
 			</File>
 			<File
+				RelativePath=".\ext\skia_utils.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\ext\skia_utils.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ext\skia_utils_win.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\ext\skia_utils_win.h"
+				>
+			</File>
+			<File
 				RelativePath=".\ext\vector_canvas.cc"
 				>
 			</File>
diff --git a/webkit/port/platform/graphics/FontWin.cpp b/webkit/port/platform/graphics/FontWin.cpp
index ac28623..0fa5a26 100644
--- a/webkit/port/platform/graphics/FontWin.cpp
+++ b/webkit/port/platform/graphics/FontWin.cpp
@@ -35,8 +35,8 @@
 #include "SkiaUtils.h"
 #include "UniscribeHelperTextRun.h"
 
-#include "base/gfx/skia_utils.h"  // TODO(brettw) remove this dependency.
 #include "skia/ext/platform_canvas_win.h"
+#include "skia/ext/skia_utils_win.h"
 
 namespace WebCore {
 
@@ -69,7 +69,7 @@ void Font::drawGlyphs(GraphicsContext* graphicsContext,
     color = SkColorSetRGB(SkColorGetR(color),
                           SkColorGetG(color),
                           SkColorGetB(color));
-    SetTextColor(hdc, gfx::SkColorToCOLORREF(color));
+    SetTextColor(hdc, skia::SkColorToCOLORREF(color));
     SetBkMode(hdc, TRANSPARENT);
 
     // Windows needs the characters and the advances in nice contiguous
@@ -168,7 +168,7 @@ void Font::drawComplexText(GraphicsContext* graphicsContext,
     color = SkColorSetRGB(SkColorGetR(color),
                           SkColorGetG(color),
                           SkColorGetB(color));
-    SetTextColor(hdc, gfx::SkColorToCOLORREF(color));
+    SetTextColor(hdc, skia::SkColorToCOLORREF(color));
     SetBkMode(hdc, TRANSPARENT);
 
     // Uniscribe counts the coordinates from the upper left, while WebKit uses
diff --git a/webkit/port/platform/graphics/ImageSkia.cpp b/webkit/port/platform/graphics/ImageSkia.cpp
index cfdc739..12d5ae9 100644
--- a/webkit/port/platform/graphics/ImageSkia.cpp
+++ b/webkit/port/platform/graphics/ImageSkia.cpp
@@ -43,7 +43,7 @@
 #include "SkiaUtils.h"
 #include "SkShader.h"
 
-#include "base/gfx/image_operations.h"  // TODO(brettw) remove this dependency.
+#include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
 
 namespace WebCore {
@@ -217,8 +217,8 @@ void drawResampledBitmap(SkCanvas& canvas,
                                    destBitmapSubsetSkI.height());
 
         // Resample the needed part of the image.
-        SkBitmap resampled = gfx::ImageOperations::Resize(subset,
-            gfx::ImageOperations::RESIZE_LANCZOS3,
+        SkBitmap resampled = skia::ImageOperations::Resize(subset,
+            skia::ImageOperations::RESIZE_LANCZOS3,
             gfx::Size(destRectRounded.width(), destRectRounded.height()),
             destBitmapSubset);
 
@@ -350,8 +350,8 @@ void Image::drawPattern(GraphicsContext* context,
 
     if (resampling == RESAMPLE_AWESOME) {
         // Do nice resampling.
-        SkBitmap resampled = gfx::ImageOperations::Resize(src_subset,
-            gfx::ImageOperations::RESIZE_LANCZOS3,
+        SkBitmap resampled = skia::ImageOperations::Resize(src_subset,
+            skia::ImageOperations::RESIZE_LANCZOS3,
             gfx::Size(static_cast<int>(dest_bitmap_width),
                       static_cast<int>(dest_bitmap_height)));
         shader = SkShader::CreateBitmapShader(
diff --git a/webkit/port/platform/graphics/NativeImageSkia.cpp b/webkit/port/platform/graphics/NativeImageSkia.cpp
index fb765eb..7158d06 100644
--- a/webkit/port/platform/graphics/NativeImageSkia.cpp
+++ b/webkit/port/platform/graphics/NativeImageSkia.cpp
@@ -28,12 +28,12 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "config.h"
-
-#include "base/gfx/image_operations.h"
-
 #include "NativeImageSkia.h"
+
 #include "SkiaUtils.h"
 
+#include "skia/ext/image_operations.h"
+
 NativeImageSkia::NativeImageSkia()
     : SkBitmap(),
       m_isDataComplete(false),
@@ -61,8 +61,8 @@ bool NativeImageSkia::hasResizedBitmap(int w, int h) const {
 
 SkBitmap NativeImageSkia::resizedBitmap(int w, int h) const {
     if (m_resizedImage.width() != w || m_resizedImage.height() != h) {
-        m_resizedImage = gfx::ImageOperations::Resize(*this,
-            gfx::ImageOperations::RESIZE_LANCZOS3, gfx::Size(w, h));
+        m_resizedImage = skia::ImageOperations::Resize(*this,
+            skia::ImageOperations::RESIZE_LANCZOS3, gfx::Size(w, h));
     }
     return m_resizedImage;
 }
diff --git a/webkit/port/platform/graphics/PlatformContextSkia.cpp b/webkit/port/platform/graphics/PlatformContextSkia.cpp
index 06b3c0a..1c63927 100644
--- a/webkit/port/platform/graphics/PlatformContextSkia.cpp
+++ b/webkit/port/platform/graphics/PlatformContextSkia.cpp
@@ -34,8 +34,6 @@
 #include "SkiaUtils.h"
 #include "wtf/MathExtras.h"
 
-#include "base/gfx/image_operations.h"  // TODO(brettw) remove this depencency.
-#include "base/gfx/skia_utils.h"  // TODO(brettw) remove this depencency.
 #include "skia/ext/platform_canvas.h"
 
 #include "SkBitmap.h"
diff --git a/webkit/port/rendering/RenderThemeWin.cpp b/webkit/port/rendering/RenderThemeWin.cpp
index 907a6e4..18d841c 100644
--- a/webkit/port/rendering/RenderThemeWin.cpp
+++ b/webkit/port/rendering/RenderThemeWin.cpp
@@ -37,9 +37,8 @@
 #include "SkiaUtils.h"
 #include "ThemeHelperWin.h"
 
-#include "base/gfx/native_theme.h"
-#include "base/gfx/skia_utils.h"
-#include "base/win_util.h"
+#include "base/gfx/native_theme.h"  // TODO(brettw) fix this dependency.
+#include "base/win_util.h"  // TODO(brettw) fix this dependency.
 
 namespace {
 
@@ -572,7 +571,7 @@ bool RenderThemeWin::paintTextFieldInternal(RenderObject* o,
     gfx::PlatformCanvas* canvas = helper.context()->platformContext()->canvas();
 
     HDC hdc = canvas->beginPlatformPaint();
-    COLORREF clr = gfx::SkColorToCOLORREF(o->style()->backgroundColor().rgb());
+    COLORREF clr = o->style()->backgroundColor().rgb();
     RECT renderRect = helper.rect();
 
     gfx::NativeTheme::instance()->PaintTextField(hdc,
diff --git a/webkit/tools/test_shell/test_shell_tests.vcproj b/webkit/tools/test_shell/test_shell_tests.vcproj
index 4f6a036..cebf759 100644
--- a/webkit/tools/test_shell/test_shell_tests.vcproj
+++ b/webkit/tools/test_shell/test_shell_tests.vcproj
@@ -307,6 +307,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\skia\ext\convolver_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\glue\cpp_bound_class_unittest.cc"
 				>
 			</File>
@@ -339,6 +343,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\skia\ext\image_operations_unittest.cc"
+				>
+			</File>
+			<File
 				RelativePath=".\keyboard_unittest.cc"
 				>
 			</File>